Protect spatialite connection (dis)connection with a mutex

(cherry-picked from c910187)

Author: nyalldawson

src/providers/spatialite/qgsspatialiteconnection.cpp

@@ -666,6 +666,7 @@ bool QgsSpatiaLiteConnection::isDeclaredHidden( sqlite3 *handle, const QString &
 
 
 QMap < QString, QgsSqliteHandle * > QgsSqliteHandle::sHandles;
+QMutex QgsSqliteHandle::sHandleMutex;
 
 
 bool QgsSqliteHandle::checkMetadata( sqlite3 *handle )
@@ -696,6 +697,7 @@ bool QgsSqliteHandle::checkMetadata( sqlite3 *handle )
 QgsSqliteHandle *QgsSqliteHandle::openDb( const QString &dbPath, bool shared )
 {
   //QMap < QString, QgsSqliteHandle* >&handles = QgsSqliteHandle::handles;
+  QMutexLocker locker( &sHandleMutex );
 
   if ( shared && sHandles.contains( dbPath ) )
   {
@@ -743,6 +745,7 @@ void QgsSqliteHandle::closeDb( QgsSqliteHandle *&handle )
   }
   else
   {
+    QMutexLocker locker( &sHandleMutex );
     QMap < QString, QgsSqliteHandle * >::iterator i;
     for ( i = sHandles.begin(); i != sHandles.end() && i.value() != handle; ++i )
       ;
@@ -762,6 +765,7 @@ void QgsSqliteHandle::closeDb( QgsSqliteHandle *&handle )
 
 void QgsSqliteHandle::closeAll()
 {
+  QMutexLocker locker( &sHandleMutex );
   qDeleteAll( sHandles );
   sHandles.clear();
 }

src/providers/spatialite/qgsspatialiteconnection.h

@@ -17,6 +17,7 @@
 
 #include <QStringList>
 #include <QObject>
+#include <QMutex>
 
 #include "qgsspatialiteutils.h"
 
@@ -178,6 +179,7 @@ class QgsSqliteHandle
     bool mIsValid;
 
     static QMap < QString, QgsSqliteHandle * > sHandles;
+    static QMutex sHandleMutex;
 };