[authentication manager] Avoid crossing mutex wires when checking for…

… master password
qgis · May 15, 2020 · 17d5377 · 17d5377
1 parent f9b067e
commit 17d5377
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -501,11 +501,13 @@ bool QgsAuthManager::setMasterPassword( bool verify )
   if ( mMasterPass.isEmpty() )
   {
     QgsDebugMsg( QStringLiteral( "Master password is not yet set by user" ) );
+    locker.unlock();
     if ( !masterPasswordInput() )
     {
       QgsDebugMsg( QStringLiteral( "Master password input canceled by user" ) );
       return false;
     }
+    locker.relock();
   }
   else
   {
@@ -1204,13 +1206,14 @@ bool QgsAuthManager::updateAuthenticationConfig( const QgsAuthMethodConfig &conf
 
 bool QgsAuthManager::loadAuthenticationConfig( const QString &authcfg, QgsAuthMethodConfig &mconfig, bool full )
 {
-  QMutexLocker locker( mMutex );
   if ( isDisabled() )
     return false;
 
   if ( full && !setMasterPassword( true ) )
     return false;
 
+  QMutexLocker locker( mMutex );
+
   QSqlQuery query( authDatabaseConnection() );
   if ( full )
   {