summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-08-03 22:57:28 +0200
committerFlorian Bruhin <qt-project.org@the-compiler.org>2015-08-10 08:16:16 +0000
commit36e1bb310c35b8d55a8ea2e8c168f9376894cd1d (patch)
tree8b0455c3579821950ec86cda8ec222203c47a42a
parentc3e58209d3601d86eeacde7abeeb39eb67a5aaf3 (diff)
Check m_p in WebCore::SocketStreamHandle::platformClose().
Also see a related Chromium fix: http://trac.webkit.org/changeset/111656/trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp Change-Id: I14d4279dad5db56a2a4a273e89e76456d8eb1702 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-rw-r--r--Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
index 103dc1fcc..ca7b60cd2 100644
--- a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
+++ b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
@@ -215,7 +215,8 @@ int SocketStreamHandle::platformSend(const char* data, int len)
void SocketStreamHandle::platformClose()
{
LOG(Network, "SocketStreamHandle %p platformClose", this);
- m_p->close();
+ if (m_p)
+ m_p->close();
}
void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&)