diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-11-04 21:32:42 +0100 |
|---|---|---|
| committer | Florian Bruhin <qt-project.org@the-compiler.org> | 2015-11-05 09:26:00 +0000 |
| commit | 2caa61dc485dc7d38c847ed6c6cff774fcf80061 (patch) | |
| tree | 4220d19b64d5c90aa3798d73e6cb9b7722e2e7fb | |
| parent | 0d592678bad23a77f35c109253a0263664e69812 (diff) | |
| download | qtwebkit-2caa61dc485dc7d38c847ed6c6cff774fcf80061.tar.gz | |
Check m_socket in SocketStreamHandlePrivate::close.
m_socket can be set to 0 in the constructor, e.g. when Qt is compiled without
SSL support.
Change-Id: Ic3bb18f6c801d463e2277b4c19ef2c790216bf69
Task-number: QTBUG-49027
Reviewed-by: Richard J. Moore <rich@kde.org>
| -rw-r--r-- | Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp index ca7b60cd2..d4cbdc78c 100644 --- a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp +++ b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp @@ -127,7 +127,7 @@ int SocketStreamHandlePrivate::send(const char* data, int len) void SocketStreamHandlePrivate::close() { - if (m_streamHandle && m_streamHandle->m_state == SocketStreamHandleBase::Connecting) { + if (m_socket && m_streamHandle && m_streamHandle->m_state == SocketStreamHandleBase::Connecting) { m_socket->abort(); m_streamHandle->client()->didCloseSocketStream(m_streamHandle); return; |