[Spatialite provider] Properly destroy QgsSpatiaLiteConnPool singleton at provider unloading. Should fix frequent crash in PyQgsServerWMS on Travis (fixes #17447)

rouault · rouault · commit 581d0d30ca89 · 2017-11-15T23:23:56.000+01:00
diff --git a/src/providers/spatialite/qgsspatialiteconnpool.cpp b/src/providers/spatialite/qgsspatialiteconnpool.cpp
@@ -13,11 +13,30 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QMutex>
+#include <QMutexLocker>
+
 #include "qgsspatialiteconnpool.h"
 
-QgsSpatiaLiteConnPool QgsSpatiaLiteConnPool::sInstance;
+QgsSpatiaLiteConnPool *QgsSpatiaLiteConnPool::sInstance = nullptr;
 
 QgsSpatiaLiteConnPool *QgsSpatiaLiteConnPool::instance()
 {
-  return &sInstance;
+  if ( ! sInstance )
+  {
+    static QMutex sMutex;
+    QMutexLocker locker( &sMutex );
+    if ( ! sInstance )
+    {
+      sInstance = new QgsSpatiaLiteConnPool();
+    }
+  }
+  return sInstance;
+}
+
+// static public
+void QgsSpatiaLiteConnPool::cleanupInstance()
+{
+  delete sInstance;
+  sInstance = nullptr;
 }
diff --git a/src/providers/spatialite/qgsspatialiteconnpool.h b/src/providers/spatialite/qgsspatialiteconnpool.h
@@ -68,9 +68,19 @@ class QgsSpatiaLiteConnPoolGroup : public QObject, public QgsConnectionPoolGroup
 //! SpatiaLite connection pool - singleton
 class QgsSpatiaLiteConnPool : public QgsConnectionPool<QgsSqliteHandle *, QgsSpatiaLiteConnPoolGroup>
 {
-    static QgsSpatiaLiteConnPool sInstance;
+    static QgsSpatiaLiteConnPool *sInstance;
   public:
     static QgsSpatiaLiteConnPool *instance();
+
+    // Singleton cleanup
+    //
+    // Make sure nobody is using the instance before calling
+    // this function.
+    //
+    // WARNING: concurrent call from multiple threads may result
+    //          in double-free of the instance.
+    //
+    static void cleanupInstance();
 };
 
 
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -5900,6 +5900,7 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e
 
 QGISEXTERN void cleanupProvider()
 {
+  QgsSpatiaLiteConnPool::cleanupInstance();
   QgsSqliteHandle::closeAll();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5900,6 +5900,7 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e`
`5900`	`5900`
`5901`	`5901`	`QGISEXTERN void cleanupProvider()`
`5902`	`5902`	`{`
	`5903`	`+ QgsSpatiaLiteConnPool::cleanupInstance();`
`5903`	`5904`	`QgsSqliteHandle::closeAll();`
`5904`	`5905`	`}`
`5905`	`5906`