Fix crash when authentication fails. Fix #7913

biolds · Laurent Defert · commit c1797fc737ce · 2013-05-30T11:51:50.000+02:00
- Fix pointer dereferencing
- Remove call to uninitialized button
As stated by Valgrind:

==13851== Use of uninitialised value of size 8
==13851==    at 0x9961780: QWidget::setEnabled(bool) (in /usr/lib/x86_64-linux-gnu/libQtGui.so.4.8.2)
==13851==    by 0x27600FB1: QgsWFSSourceSelect::capabilitiesReplyFinished() (qgswfssourceselect.cpp:211)
==13851==    by 0x2760B78F: QgsWFSSourceSelect::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (moc_qgswfssourceselect.cxx:156)
==13851==    by 0x93F554E: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.2)
==13851==    by 0x2760A458: QgsWFSCapabilities::gotCapabilities() (moc_qgswfscapabilities.cxx:103)
==13851==    by 0x275F88CD: QgsWFSCapabilities::capabilitiesReplyFinished() (qgswfscapabilities.cpp:156)
==13851==    by 0x2760A331: QgsWFSCapabilities::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (moc_qgswfscapabilities.cxx:54)
==13851==    by 0x93F554E: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.2)
==13851==    by 0xA46E824: ??? (in /usr/lib/x86_64-linux-gnu/libQtNetwork.so.4.8.2)
==13851==    by 0xA4DC904: ??? (in /usr/lib/x86_64-linux-gnu/libQtNetwork.so.4.8.2)
==13851==    by 0x93F4A2D: QObject::event(QEvent*) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.2)
==13851==    by 0x991470B: QApplicationPrivate::notify_helper(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQtGui.so.4.8.2)
==13851==
diff --git a/src/gui/qgscredentialdialog.cpp b/src/gui/qgscredentialdialog.cpp
@@ -64,7 +64,7 @@ void QgsCredentialDialog::requestCredentials( QString realm, QString *username,
 
   QgsDebugMsg( "exec()" );
   *ok = exec() == QDialog::Accepted;
-  QgsDebugMsg( QString( "exec(): %1" ).arg( ok ? "true" : "false" ) );
+  QgsDebugMsg( QString( "exec(): %1" ).arg( *ok ? "true" : "false" ) );
 
   QApplication::restoreOverrideCursor();
 
diff --git a/src/providers/wfs/qgswfssourceselect.cpp b/src/providers/wfs/qgswfssourceselect.cpp
@@ -207,8 +207,6 @@ void QgsWFSSourceSelect::capabilitiesReplyFinished()
     }
     // handle errors
     QMessageBox::critical( 0, title, mCapabilities->errorMessage() );
-
-    btnAdd->setEnabled( false );
     return;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,6 @@ void QgsWFSSourceSelect::capabilitiesReplyFinished()`
`207`	`207`	`}`
`208`	`208`	`// handle errors`
`209`	`209`	`QMessageBox::critical( 0, title, mCapabilities->errorMessage() );`
`210`		`-`
`211`		`- btnAdd->setEnabled( false );`
`212`	`210`	`return;`
`213`	`211`	`}`
`214`	`212`