mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: check we have dive before dereferencing

Browse source 
Coverity CID: 208341

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-26 13:37:40 -08:00
parent 652e382e68
commit 2c8614e43e
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mobile-widgets/qmlmanager.cpp
View file

@ -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) QString startpressure, QString endpressure, QString gasmix, QString cylinder, int rating, int visibility)
{ {
struct dive *d = get_dive_by_uniq_id(diveId.toInt()); struct dive *d = get_dive_by_uniq_id(diveId.toInt());
if (!d) {
appendTextToLog("cannot commit changes: no dive");
return;
}
DiveObjectHelper *myDive = new DiveObjectHelper(d); DiveObjectHelper *myDive = new DiveObjectHelper(d);
// notes comes back as rich text - let's convert this into plain text // 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); doc.setHtml(notes);
notes = doc.toPlainText(); notes = doc.toPlainText();
if (!d) {
appendTextToLog("cannot commit changes: no dive");
return;
}
bool diveChanged = false; bool diveChanged = false;
bool needResort = false; bool needResort = false;