From 2c57568d563feb95ef67bb8480bbb839d2daaaf8 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 15 Nov 2013 11:31:35 +0900 Subject: [PATCH] Fix potential crash when merging trips strdup doesn't like to be passed a NULL pointer. Signed-off-by: Dirk Hohndel --- qt-ui/divelistview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index c1dde082b..b905b32be 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -431,9 +431,9 @@ void DiveListView::merge_trip(const QModelIndex &a, int offset) if (trip_a == trip_b || !trip_a || !trip_b) return; - if (!trip_a->location) + if (!trip_a->location && trip_b->location) trip_a->location = strdup(trip_b->location); - if (!trip_a->notes) + if (!trip_a->notes && trip_b->notes) trip_a->notes = strdup(trip_b->notes); while (trip_b->dives) add_dive_to_trip(trip_b->dives, trip_a);