FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crash fix: prevent crash in MapLocationModel::reload

Browse Source 
Commit 0c387549164d7eec3ea6647c54ada2fba7f8d5e6 introduced a
bug in MapLocationModel::reload() by setting an entry in the
name-to-location map before the location was initialized.

Move the setting of the map entry back where it was before:
after the assignment of the location variable.

Moreover, define the location variable directly on allocation
of the location to avoid thus bugs in the future.

Why did we not get a "might be used unitialized" warning
anyway?

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-07-27 22:30:09 +02:00 committed by Dirk Hohndel
parent a0cd89f850
commit b0f1b25806
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,4 +1,4 @@
- fix crash when (re-)loading maps
---
* Always add new entries at the very top of this file above other existing entries and this note.
* Use this layout for new entries: `[Area]: [Details about the change] [reference thread / issue]`

6
qt-models/maplocationmodel.cpp
View File

@ -140,7 +140,6 @@ void MapLocationModel::reload(QObject *map)
m_selectedDs.clear();
QMap<QString, MapLocation *> locationNameMap;
MapLocation *location;
#ifdef SUBSURFACE_MOBILE
bool diveSiteMode = false;
@ -184,10 +183,11 @@ void MapLocationModel::reload(QObject *map)
if (dsCoord.distanceTo(coord) < MIN_DISTANCE_BETWEEN_DIVE_SITES_M)
continue;
}
locationNameMap[name] = location;
}
location = new MapLocation(ds, dsCoord, name);
MapLocation *location = new MapLocation(ds, dsCoord, name);
m_mapLocations.append(location);
if (!diveSiteMode)
locationNameMap[name] = location;
}
endResetModel();