gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-04 05:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rubidium 2010-04-08 17:07:35 +00:00
parent fb364e4426
commit 54067acb0f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openttd.cpp
View File

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