From 80f76773c1940b94a907a76c8d42b60470b33d3d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 27 Oct 2019 07:22:56 -0400 Subject: Cleanup: prevent uninitialized pointer 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 --- desktop-widgets/command_divelist.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'desktop-widgets') diff --git a/desktop-widgets/command_divelist.cpp b/desktop-widgets/command_divelist.cpp index 0796c6f5f..6e4ddb427 100644 --- a/desktop-widgets/command_divelist.cpp +++ b/desktop-widgets/command_divelist.cpp @@ -383,6 +383,9 @@ AddDive::AddDive(dive *d, bool autogroup, bool newNumber) d->dc.maxdepth.mm = 0; fixup_dive(d); + // this only matters if undoit were called before redoit + currentDive = nullptr; + // Get an owning pointer to a moved dive. OwningDivePtr divePtr(move_dive(d)); 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)); + // this only matters if undoit were called before redoit + currentDive = nullptr; + struct dive_table dives_to_add = { 0 }; struct dive_table dives_to_remove = { 0 }; struct trip_table trips_to_add = { 0 }; -- cgit v1.2.3-70-g09d2