summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2010-08-30 13:43:01 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:06:48 (GMT)
commite65c62cbe572f689ae83c2bfa7d08e20c4944f07 (patch)
treee7b284460c918cd2eeb592f7547c2356e5fe33cb /tests/auto
parent7ea82acb7694b5791d9476def0a33868599b3fbc (diff)
downloadQt-e65c62cbe572f689ae83c2bfa7d08e20c4944f07.zip
Qt-e65c62cbe572f689ae83c2bfa7d08e20c4944f07.tar.gz
Qt-e65c62cbe572f689ae83c2bfa7d08e20c4944f07.tar.bz2
QSslConfiguration: fix crash when accessing null pointer
We were accessing the d-pointer of a QSslConfiguration which is initialized lazily. Reviewed-by: Markus Goetz Task-number: QTBUG-13265 (cherry picked from commit d686a95ed54b19336affc14c9222de54c9af0e72)
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qsslsocket/tst_qsslsocket.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index f931291..6ae4b10 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -181,6 +181,7 @@ private slots:
void ignoreSslErrorsListWithSlot();
void readFromClosedSocket();
void writeBigChunk();
+ void setEmptyDefaultConfiguration();
static void exitLoop()
{
@@ -1794,6 +1795,21 @@ void tst_QSslSocket::writeBigChunk()
socket->close();
}
+void tst_QSslSocket::setEmptyDefaultConfiguration()
+{
+ // used to produce a crash in QSslConfigurationPrivate::deepCopyDefaultConfiguration, QTBUG-13265
+
+ if (!QSslSocket::supportsSsl())
+ return;
+
+ QSslConfiguration emptyConf;
+ QSslConfiguration::setDefaultConfiguration(emptyConf);
+
+ QSslSocketPtr socket = newSocket();
+ socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
+
+}
+
#endif // QT_NO_OPENSSL
QTEST_MAIN(tst_QSslSocket)