From: Martin Willi <martin@revosec.ch>
Date: Fri, 10 Apr 2015 11:36:58 +0000 (+0200)
Subject: sqlite: Use our locking mechanism also when sqlite3_threadsafe() returns 0
X-Git-Tag: 5.3.1dr1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a84a4049d6f7625dd585e39b7b6f871ec8e5bf6;p=thirdparty%2Fstrongswan.git

sqlite: Use our locking mechanism also when sqlite3_threadsafe() returns 0

We previously checked for older library versions without locking support at
all. But newer libraries can be built in single-threading mode as well, where
we have to care about the locking.
---

diff --git a/src/libstrongswan/plugins/sqlite/sqlite_database.c b/src/libstrongswan/plugins/sqlite/sqlite_database.c
index ec1ca14042..0a35e30174 100644
--- a/src/libstrongswan/plugins/sqlite/sqlite_database.c
+++ b/src/libstrongswan/plugins/sqlite/sqlite_database.c
@@ -68,6 +68,18 @@ typedef struct {
 
 } transaction_t;
 
+/**
+ * Check if the SQLite library is thread safe
+ */
+static bool is_threadsave()
+{
+#if SQLITE_VERSION_NUMBER >= 3005000
+	return sqlite3_threadsafe() > 0;
+#endif
+	/* sqlite connections prior to 3.5 may be used by a single thread only */
+	return FALSE;
+}
+
 /**
  * Create and run a sqlite stmt using a sql string and args
  */
@@ -168,9 +180,10 @@ typedef struct {
 static void sqlite_enumerator_destroy(sqlite_enumerator_t *this)
 {
 	sqlite3_finalize(this->stmt);
-#if SQLITE_VERSION_NUMBER < 3005000
-	this->database->mutex->unlock(this->database->mutex);
-#endif
+	if (!is_threadsave())
+	{
+		this->database->mutex->unlock(this->database->mutex);
+	}
 	free(this->columns);
 	free(this);
 }
@@ -248,10 +261,10 @@ METHOD(database_t, query, enumerator_t*,
 	sqlite_enumerator_t *enumerator = NULL;
 	int i;
 
-#if SQLITE_VERSION_NUMBER < 3005000
-	/* sqlite connections prior to 3.5 may be used by a single thread only, */
-	this->mutex->lock(this->mutex);
-#endif
+	if (!is_threadsave())
+	{
+		this->mutex->lock(this->mutex);
+	}
 
 	va_start(args, sql);
 	stmt = run(this, sql, &args);