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

Cleanup: prevent uninitialized pointer

Browse Source 
This should never matter as we should never call undoit before redoit.
Extra ensurance that we don't access random data.

Found by Coverity. Fixes CID 350076

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-10-27 07:22:56 -04:00
parent e89a87a2e8
commit 80f76773c1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop-widgets/command_divelist.cpp
View File

@ -383,6 +383,9 @@ AddDive::AddDive(dive *d, bool autogroup, bool newNumber)
d->dc.maxdepth.mm = 0; d->dc.maxdepth.mm = 0;
fixup_dive(d); fixup_dive(d);
// this only matters if undoit were called before redoit
currentDive = nullptr;
// Get an owning pointer to a moved dive. // Get an owning pointer to a moved dive.
OwningDivePtr divePtr(move_dive(d)); OwningDivePtr divePtr(move_dive(d));
divePtr->selected = false; // If we clone a planned dive, it might have been selected. divePtr->selected = false; // If we clone a planned dive, it might have been selected.
@ -453,6 +456,9 @@ ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips, str
{ {
setText(tr("import %n dive(s) from %1", "", dives->nr).arg(source)); setText(tr("import %n dive(s) from %1", "", dives->nr).arg(source));
// this only matters if undoit were called before redoit
currentDive = nullptr;
struct dive_table dives_to_add = { 0 }; struct dive_table dives_to_add = { 0 };
struct dive_table dives_to_remove = { 0 }; struct dive_table dives_to_remove = { 0 };
struct trip_table trips_to_add = { 0 }; struct trip_table trips_to_add = { 0 };