network authentication: don't crash if a network request is closed while the credentials dialog is open (fixes #9379)

jef-n · jef-n · commit 7c4c7e897e14 · 2014-02-17T21:05:23.000+01:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9474,6 +9474,9 @@ void QgisApp::namAuthenticationRequired( QNetworkReply *reply, QAuthenticator *a
   if ( !ok )
     return;
 
+  if( reply->isFinished() )
+    return;
+
   auth->setUser( username );
   auth->setPassword( password );
 }
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -183,7 +183,8 @@ void QgsNetworkAccessManager::abortRequest()
 
   QgsMessageLog::logMessage( tr( "Network request %1 timed out" ).arg( reply->url().toString() ), tr( "Network" ) );
 
-  reply->abort();
+  if( reply->isRunning() )
+    reply->close();
 }
 
 QString QgsNetworkAccessManager::cacheLoadControlName( QNetworkRequest::CacheLoadControl theControl )

Original file line number	Diff line number	Diff line change
`@@ -9474,6 +9474,9 @@ void QgisApp::namAuthenticationRequired( QNetworkReply reply, QAuthenticator a`
`9474`	`9474`	`if ( !ok )`
`9475`	`9475`	`return;`
`9476`	`9476`
	`9477`	`+ if( reply->isFinished() )`
	`9478`	`+ return;`
	`9479`	`+`
`9477`	`9480`	`auth->setUser( username );`
`9478`	`9481`	`auth->setPassword( password );`
`9479`	`9482`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,8 @@ void QgsNetworkAccessManager::abortRequest()`
`183`	`183`
`184`	`184`	`QgsMessageLog::logMessage( tr( "Network request %1 timed out" ).arg( reply->url().toString() ), tr( "Network" ) );`
`185`	`185`
`186`		`- reply->abort();`
	`186`	`+ if( reply->isRunning() )`
	`187`	`+ reply->close();`
`187`	`188`	`}`
`188`	`189`
`189`	`190`	`QString QgsNetworkAccessManager::cacheLoadControlName( QNetworkRequest::CacheLoadControl theControl )`