Changeset 52112 in webkit

Timestamp:

Dec 14, 2009 12:49:51 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-14 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] crash when clicking "Sign out" in GMail
​https://bugs.webkit.org/show_bug.cgi?id=32300

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

• platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-14  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] crash when clicking "Sign out" in GMail
+        https://bugs.webkit.org/show_bug.cgi?id=32300
+
+        When the ResourceLoader cancels the handle we have to make sure not to access
+        the resource handle afterwards again.
+        This complete r29515
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+
 2009-12-14  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -321 +321 @@
     QUrl redirection = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
     if (redirection.isValid()) {
+        m_redirected = true;
+
         QUrl newUrl = m_reply->url().resolved(redirection);
         ResourceRequest newRequest = m_resourceHandle->request();
@@ -335 +337 @@
 
         client->willSendRequest(m_resourceHandle, newRequest, response);
-        m_redirected = true;
+        if (!m_resourceHandle) // network error did cancel the request
+            return;
+
         m_request = newRequest.toNetworkRequest(m_resourceHandle->getInternal()->m_frame);
         return;