diff -r ef0373b55136 -r 758a864f9613 src/network/ssl/qsslsocket.cpp --- a/src/network/ssl/qsslsocket.cpp Fri Sep 17 08:34:18 2010 +0300 +++ b/src/network/ssl/qsslsocket.cpp Mon Oct 04 01:19:32 2010 +0300 @@ -210,7 +210,7 @@ valid. On failure, QSslSocket will emit the QSslSocket::sslErrors() signal. This mode is the default for clients. - \value AutoVerifyPeer QSslSocket will automaticaly use QueryPeer for + \value AutoVerifyPeer QSslSocket will automatically use QueryPeer for server sockets and VerifyPeer for client sockets. \sa QSslSocket::peerVerifyMode() @@ -1966,6 +1966,11 @@ QMutexLocker locker(&globalData()->mutex); const QSslConfigurationPrivate *global = globalData()->config.constData(); + if (!global) { + ptr = 0; + return; + } + ptr->ref = 1; ptr->peerCertificate = global->peerCertificate; ptr->peerCertificateChain = global->peerCertificateChain;