libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 01:57:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Fix nullptr access in Sector iterators

Browse Source
This commit is contained in:
a/ 2021-08-15 08:36:30 +09:00
parent ec88076e91
commit 29c5f6e749
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/saga2/objects.cpp
View File

@ -3379,6 +3379,10 @@ ObjectID SectorRegionObjectIterator::first(GameObject **obj) {
sectorCoords = minSector;
currentSector = searchWorld->getSector(sectorCoords.u, sectorCoords.v);
if (currentSector == nullptr)
return Nothing;
while (currentSector->childID == Nothing) {
if (++sectorCoords.v >= maxSector.v) {
sectorCoords.v = minSector.v;
@ -3625,12 +3629,18 @@ ObjectID RegionalObjectIterator::first(GameObject **obj) {
ObjectID currentObjectID;
currentObjectID = SectorRegionObjectIterator::first(&currentObject);
if (currentObjectID == Nothing)
return Nothing;
while (currentObjectID != Nothing
&& !inRegion(currentObject->getLocation())) {
currentObjectID = SectorRegionObjectIterator::next(&currentObject);
}
if (obj != nullptr) *obj = currentObject;
if (obj != nullptr)
*obj = currentObject;
return currentObjectID;
}

4
engines/saga2/path.cpp
View File

@ -1463,7 +1463,7 @@ void PathRequest::initialize(void) {
baseCoords.v
+ (searchCenter << kTileUVShift) * 2,
0));
GameObject *obj;
GameObject *obj = nullptr;
for (iter.first(&obj);
obj != nullptr;
@ -2497,7 +2497,7 @@ TilePoint selectNearbySite(
baseCoords.v
+ (searchCenter << kTileUVShift) * 2,
0));
GameObject *obj;
GameObject *obj = nullptr;
for (iter.first(&obj);
obj != nullptr;