From be0a708db0b05f2b8a42f81d49020ca2e656b714 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 2 Jun 2015 15:35:06 +0200 Subject: Two if's to prevent null pointer dereferencing I need these to prevent subsurface from segfaulting when opening a new log. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- qt-models/divelocationmodel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index edf15b707..3e17f4fe2 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -29,6 +29,9 @@ QVariant LocationInformationModel::data(const QModelIndex &index, int role) cons return QVariant(); struct dive_site *ds = get_dive_site(index.row()); + if (!ds) + return QVariant(); + switch(role) { case Qt::DisplayRole : return qPrintable(ds->name); case DIVE_SITE_UUID : return ds->uuid; @@ -77,7 +80,8 @@ bool LocationInformationModel::removeRows(int row, int count, const QModelIndex beginRemoveRows(QModelIndex(), row, row); struct dive_site *ds = get_dive_site(row); - delete_dive_site(ds->uuid); + if (ds) + delete_dive_site(ds->uuid); endRemoveRows(); return true; } -- cgit v1.2.3-70-g09d2