From 329a6bc0753260f3d0184448155a8ef6844d9b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Cu=C3=B1at?= Date: Wed, 12 Apr 2017 21:46:57 +0200 Subject: [PATCH] smtk-import: Abort bookmark parsing if table doesn't open MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not just report the failure but abort parsing or we will get a crash Signed-off-by: Salvador Cuñat --- smtk-import/smartrak.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/smtk-import/smartrak.c b/smtk-import/smartrak.c index 6b8a1f60c..ba38c6b33 100644 --- a/smtk-import/smartrak.c +++ b/smtk-import/smartrak.c @@ -678,8 +678,10 @@ static void smtk_parse_bookmarks(MdbHandle *mdb, struct dive *d, char *dive_idx) struct event *ev; table = smtk_open_table(mdb, "Marker", col, bound_values); - if (!table) + if (!table) { report_error("[smtk-import] Error - Couldn't open table 'Marker', dive %d", d->number); + return; + } while (mdb_fetch_row(table)) { if (same_string(col[0]->bind_ptr, dive_idx)) { time = lrint(strtod(col[4]->bind_ptr, NULL) * 60);