From 9fead7189904f002b8ccb9eb3934be9505038c1b Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 15 Feb 2018 12:50:26 +0100
Subject: [PATCH] Fix crash during migration on Android by avoiding to throw
 exceptions. Apparently exceptions do not work reliabily on android, at least
 not with our current toolchain and compilation options.

---
 src/db/main-db.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index 248c681a9..dbb36717a 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -1256,13 +1256,11 @@ template<typename T>
 static T getValueFromRow (const soci::row &row, int index, bool &isNull) {
 	isNull = false;
 
-	try {
-		return row.get<T>(size_t(index));
-	} catch (const exception &) {
+	if (row.get_indicator(size_t(index)) == soci::i_null){
 		isNull = true;
+		return T();
 	}
-
-	return T();
+	return row.get<T>(size_t(index));
 }
 
 // -----------------------------------------------------------------------------