Changeset 29515 in webkit

Timestamp:

Jan 16, 2008 1:38:40 AM (16 years ago)

Author:

Simon Hausmann

Message:

Fix crashes in the new networking code.

When the ResourceLoader cancels the handle we have to make sure not to access
the resource handle afterwards again.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/qt/QNetworkReplyHandler.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-16  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Lars Knoll <lars@trolltech.com>.
+
+        Fix crashes in the new networking code.
+
+        When the ResourceLoader cancels the handle we have to make sure not to access
+        the resource handle afterwards again.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::finish):
+        (WebCore::QNetworkReplyHandler::forwardData):
+
 2008-01-16  Lars Knoll  <lars@trolltech.com>
 

trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

@@ -67 +67 @@
 void QNetworkReplyHandler::abort()
 {
+    m_resourceHandle = 0;
     if (m_reply) {
         disconnect(m_reply, 0, this, 0);
@@ -78 +79 @@
     sendResponseIfNeeded();
 
+    if (!m_resourceHandle)
+        return;
     ResourceHandleClient* client = m_resourceHandle->client();
     m_reply->deleteLater();
@@ -97 +100 @@
 void QNetworkReplyHandler::sendResponseIfNeeded()
 {
-    if (m_responseSent)
+    if (m_responseSent || !m_resourceHandle)
         return;
     m_responseSent = true;
@@ -164 +167 @@
         return;
 
+    if (!m_resourceHandle)
+        return;
+
     QByteArray data = m_reply->read(m_reply->bytesAvailable());