Add mutex locker when accessing to attribute member

qgis · Aug 16, 2019 · 35c2658 · 35c2658
1 parent 883f365
commit 35c2658
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -366,8 +366,15 @@ QgsPostgresConn::~QgsPostgresConn()
   mConn = nullptr;
 }
 
+void QgsPostgresConn::ref()
+{
+  QMutexLocker locker( &mLock );
+  ++mRef;
+}
+
 void QgsPostgresConn::unref()
 {
+  QMutexLocker locker( &mLock );
   if ( --mRef > 0 )
     return;
 
@@ -381,6 +388,8 @@ void QgsPostgresConn::unref()
     connections.remove( key );
   }
 
+  // to avoid destroying locked mutex
+  locker.unlock();
   delete this;
 }
 
@@ -424,6 +433,7 @@ void QgsPostgresConn::addColumnInfo( QgsPostgresLayerProperty &layerProperty, co
 
 bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchPublicOnly, bool allowGeometrylessTables, const QString &schema )
 {
+  QMutexLocker locker( &mLock );
   int nColumns = 0;
   int foundInTables = 0;
   QgsPostgresResult result;
@@ -800,6 +810,8 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
 
 bool QgsPostgresConn::supportedLayers( QVector<QgsPostgresLayerProperty> &layers, bool searchGeometryColumnsOnly, bool searchPublicOnly, bool allowGeometrylessTables, const QString &schema )
 {
+  QMutexLocker locker( &mLock );
+
   // Get the list of supported tables
   if ( !getTableInfo( searchGeometryColumnsOnly, searchPublicOnly, allowGeometrylessTables, schema ) )
   {
@@ -872,6 +884,7 @@ bool QgsPostgresConn::hasPointcloud()
 /* Functions for determining available features in postGIS */
 QString QgsPostgresConn::postgisVersion()
 {
+  QMutexLocker locker( &mLock );
   if ( mGotPostgisVersion )
     return mPostgisVersionInfo;
 
@@ -1276,12 +1289,14 @@ QString QgsPostgresConn::PQerrorMessage() const
 
 int QgsPostgresConn::PQsendQuery( const QString &query )
 {
+  QMutexLocker locker( &mLock );
   Q_ASSERT( mConn );
   return ::PQsendQuery( mConn, query.toUtf8() );
 }
 
 bool QgsPostgresConn::begin()
 {
+  QMutexLocker locker( &mLock );
   if ( mTransaction )
   {
     return PQexecNR( QStringLiteral( "SAVEPOINT transaction_savepoint" ) );
@@ -1294,6 +1309,7 @@ bool QgsPostgresConn::begin()
 
 bool QgsPostgresConn::commit()
 {
+  QMutexLocker locker( &mLock );
   if ( mTransaction )
   {
     return PQexecNR( QStringLiteral( "RELEASE SAVEPOINT transaction_savepoint" ) );
@@ -1306,6 +1322,7 @@ bool QgsPostgresConn::commit()
 
 bool QgsPostgresConn::rollback()
 {
+  QMutexLocker locker( &mLock );
   if ( mTransaction )
   {
     return PQexecNR( QStringLiteral( "ROLLBACK TO SAVEPOINT transaction_savepoint" ) )
@@ -1319,6 +1336,7 @@ bool QgsPostgresConn::rollback()
 
 qint64 QgsPostgresConn::getBinaryInt( QgsPostgresResult &queryResult, int row, int col )
 {
+  QMutexLocker locker( &mLock );
   quint64 oid;
   char *p = PQgetvalue( queryResult.result(), row, col );
   size_t s = PQgetlength( queryResult.result(), row, col );
@@ -1438,6 +1456,7 @@ QString QgsPostgresConn::fieldExpression( const QgsField &fld, QString expr )
 
 void QgsPostgresConn::deduceEndian()
 {
+  QMutexLocker locker( &mLock );
   // need to store the PostgreSQL endian format used in binary cursors
   // since it appears that starting with
   // version 7.4, binary cursors return data in XDR whereas previous versions
@@ -1911,6 +1930,7 @@ void QgsPostgresConn::deleteConnection( const QString &connName )
 
 bool QgsPostgresConn::cancel()
 {
+  QMutexLocker locker( &mLock );
   PGcancel *c = ::PQgetCancel( mConn );
   if ( !c )
   {
@@ -1931,6 +1951,7 @@ bool QgsPostgresConn::cancel()
 
 QString QgsPostgresConn::currentDatabase() const
 {
+  QMutexLocker locker( &mLock );
   QString database;
   QString sql = "SELECT current_database()";
   QgsPostgresResult res( PQexec( sql ) );

diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
@@ -193,7 +193,7 @@ class QgsPostgresConn : public QObject
      */
     static QgsPostgresConn *connectDb( const QString &connInfo, bool readOnly, bool shared = true, bool transaction = false );
 
-    void ref() { ++mRef; }
+    void ref();
     void unref();
 
     //! Gets postgis version string