Changeset 140154 in webkit

Timestamp:

Jan 18, 2013 8:28:40 AM (11 years ago)

Author:

sergio@webkit.org

Message:

[Soup] Frequent crashes on redirections
​https://bugs.webkit.org/show_bug.cgi?id=107240

Reviewed by Martin Robinson.

We must ensure that the ResourceHandle has not being cancelled
before performing a redirect. This could happen while we close the
stream used to read the redirect response because it is done
asynchronously.

• platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::redirectCloseCallback): also renamed res to result.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/ResourceHandleSoup.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-18  Sergio Villar Senin  <svillar@igalia.com>
+
+        [Soup] Frequent crashes on redirections
+        https://bugs.webkit.org/show_bug.cgi?id=107240
+
+        Reviewed by Martin Robinson.
+
+        We must ensure that the ResourceHandle has not being cancelled
+        before performing a redirect. This could happen while we close the
+        stream used to read the redirect response because it is done
+        asynchronously.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::redirectCloseCallback): also renamed res to result.
+
 2013-01-18  Andrey Adaikin  <aandrey@chromium.org>
 

trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

@@ -487 +487 @@
 }
 
-static void redirectCloseCallback(GObject*, GAsyncResult* res, gpointer data)
+static void redirectCloseCallback(GObject*, GAsyncResult* result, gpointer data)
 {
     RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
     ResourceHandleInternal* d = handle->getInternal();
 
-    g_input_stream_close_finish(d->m_inputStream.get(), res, 0);
+    if (d->m_cancelled || !handle->client()) {
+        cleanupSoupRequestOperation(handle.get());
+        return;
+    }
+
+    g_input_stream_close_finish(d->m_inputStream.get(), result, 0);
     doRedirect(handle.get());
 }