From 2c8614e43ed6f543f2e644661004a88414a0404e Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 26 Dec 2017 13:37:40 -0800 Subject: Cleanup: check we have dive before dereferencing Coverity CID: 208341 Signed-off-by: Dirk Hohndel --- mobile-widgets/qmlmanager.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index b04d8aa89..20844526d 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -921,6 +921,12 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q QString startpressure, QString endpressure, QString gasmix, QString cylinder, int rating, int visibility) { struct dive *d = get_dive_by_uniq_id(diveId.toInt()); + + if (!d) { + appendTextToLog("cannot commit changes: no dive"); + return; + } + DiveObjectHelper *myDive = new DiveObjectHelper(d); // notes comes back as rich text - let's convert this into plain text @@ -928,10 +934,6 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q doc.setHtml(notes); notes = doc.toPlainText(); - if (!d) { - appendTextToLog("cannot commit changes: no dive"); - return; - } bool diveChanged = false; bool needResort = false; -- cgit v1.2.3-70-g09d2