cpp/openttd-patchpack/source Changeset - r14965:a35165b24835

Changeset - r14965:a35165b24835

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 14 years ago 2010-04-08 17:07:35
rubidium@openttd.org

(svn r19586) -Fix: some false positives in cache validity checks because cache = v->cache doesn't necessarily write all sizeof(Cache) bytes

1 file changed with 7 insertions and 3 deletions:

src/openttd.cpp

0 comments (0 inline, 0 general)

src/openttd.cpp

➞

Show inline comments

@@ @@ -1111,7 +1111,9 @@ static void CheckCaches() @@
 		switch (v->type) {
 			case VEH_ROAD: {
 				RoadVehicle *rv = RoadVehicle::From(v);
 				RoadVehicleCache cache = rv->rcache;
 				RoadVehicleCache cache;
 				memset(&cache, 0, sizeof(cache));
 				cache = rv->rcache;
 				RoadVehUpdateCache(rv);
 				if (memcmp(&cache, &rv->rcache, sizeof(RoadVehicleCache)) != 0) {
@@ @@ -1124,7 +1126,7 @@ static void CheckCaches() @@
 				Train *t = Train::From(v);
 				for (Vehicle *u = t; u != NULL; u = u->Next()) length++;
-				TrainCache *wagons = MallocT<TrainCache>(length);
+				TrainCache *wagons = CallocT<TrainCache>(length);
 				length = 0;
 				for (Train *u = t; u != NULL; u = u->Next()) wagons[length++] = u->tcache;
@@ @@ -1143,7 +1145,9 @@ static void CheckCaches() @@
 			case VEH_AIRCRAFT: {
 				Aircraft *a = Aircraft::From(v);
 				AircraftCache cache = a->acache;
 				AircraftCache cache;
 				memset(&cache, 0, sizeof(cache));
 				cache = a->acache;
 				UpdateAircraftCache(a);
 				if (memcmp(&cache, &a->acache, sizeof(AircraftCache)) != 0) {

0 comments (0 inline, 0 general)