Fix crash when accessing auth manager when no QgsApplication is available

nyalldawson · nyalldawson · commit c413f147bfb7 · 2017-11-06T10:13:31.000+10:00
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -111,6 +111,7 @@ const char *QgsApplication::QGIS_ORGANIZATION_DOMAIN = "qgis.org";
 const char *QgsApplication::QGIS_APPLICATION_NAME = "QGIS3";
 
 QgsApplication::ApplicationMembers *QgsApplication::sApplicationMembers = nullptr;
+QgsAuthManager *QgsApplication::sAuthManager = nullptr;
 
 QgsApplication::QgsApplication( int &argc, char **argv, bool GUIenabled, const QString &profileFolder, const QString &platformName )
   : QApplication( argc, argv, GUIenabled )
@@ -889,11 +890,21 @@ void QgsApplication::initQgis()
 
 QgsAuthManager *QgsApplication::authManager()
 {
-  if ( ! instance()->mAuthManager )
+  if ( instance() )
+  {
+    if ( !instance()->mAuthManager )
+    {
+      instance()->mAuthManager = QgsAuthManager::instance();
+    }
+    return instance()->mAuthManager;
+  }
+  else
   {
-    instance()->mAuthManager = QgsAuthManager::instance();
+    // no QgsApplication instance
+    if ( !sAuthManager )
+      sAuthManager = QgsAuthManager::instance();
+    return sAuthManager;
   }
-  return instance()->mAuthManager;
 }
 
 
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -749,7 +749,10 @@ class CORE_EXPORT QgsApplication : public QApplication
     QMap<QString, QIcon> mIconCache;
 
     QgsDataItemProviderRegistry *mDataItemProviderRegistry = nullptr;
+
     QgsAuthManager *mAuthManager = nullptr;
+    // ... but in case QgsApplication is never instantiated (eg with custom designer widgets), we fall back to static instance
+    static QgsAuthManager *sAuthManager;
 
     struct ApplicationMembers
     {
diff --git a/tests/src/python/test_qgsnoapplication.py b/tests/src/python/test_qgsnoapplication.py
@@ -53,6 +53,9 @@ def testNullRepresentation(self):
         QgsApplication.setNullRepresentation(nr)
         self.assertEqual(QgsApplication.nullRepresentation(), nr)
 
+    def testAuthManager(self):
+        self.assertTrue(QgsApplication.authManager())
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,10 @@ class CORE_EXPORT QgsApplication : public QApplication`
`749`	`749`	`QMap<QString, QIcon> mIconCache;`
`750`	`750`
`751`	`751`	`QgsDataItemProviderRegistry *mDataItemProviderRegistry = nullptr;`
	`752`	`+`
`752`	`753`	`QgsAuthManager *mAuthManager = nullptr;`
	`754`	`+ // ... but in case QgsApplication is never instantiated (eg with custom designer widgets), we fall back to static instance`
	`755`	`+ static QgsAuthManager *sAuthManager;`
`753`	`756`
`754`	`757`	`struct ApplicationMembers`
`755`	`758`	`{`