Attachment 345846 Details for Bug 188033 – Fix

[patch] Fix

188033.diff (text/plain), 3.94 KB, created by Basuke Suzuki on 2018-07-26 08:19:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-07-26 08:19:45 PDT

Size: 3.94 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 7245b76c53d..cddd26cc0a7 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-07-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Crash on synchronous request via ResourceHandle.
>+        https://bugs.webkit.org/show_bug.cgi?id=188033
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/wincairo/TestExpectations:
>+
> 2018-07-26  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [Curl] Test gardening
>diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations
>index 0e01d291267..9c3a551a24a 100644
>--- a/LayoutTests/platform/wincairo/TestExpectations
>+++ b/LayoutTests/platform/wincairo/TestExpectations
>@@ -842,6 +842,12 @@ fast/dom/focus-shift-crash.html [ Pass Timeout ]
> fast/dom/Range/detach-range-during-deletecontents.html [ Pass Timeout ]
> imported/blink/fast/dom/Window/open-window-features-fuzz.html [ Pass Timeout ]
> 
>+#//////////////////////////////////////////////////////////////////////////////////////////
>+# WinCairo is not ready to run http test in general, but there're some exceptions.
>+#//////////////////////////////////////////////////////////////////////////////////////////
>+
>+http/tests [ Skip ]
>+
> # WebSocket
> http/tests/websocket [ Pass ]
> http/tests/websocket/tests/hybi/contentextensions [ Failure ]
>@@ -860,7 +866,7 @@ http/tests/websocket/tests/hybi/websocket-cookie-overwrite-behavior.html [ Failu
> http/tests/websocket/tests/hybi/contentextensions/block-cookies.php [ Timeout ]
> 
> # XMLHTTPRequest (sync)
>-http/tests/xmlhttprequest/simple-sync.html [ Crash ]
>+http/tests/xmlhttprequest/simple-sync.html [ Pass ]
> 
> #///////////////////////////////////////////////////////////////////////////////
> # Issue categories below are shared with other platforms (primarily AppleWin)
>@@ -1571,7 +1577,6 @@ fast/xsl [ Skip ]
> fonts/use-typo-metrics-1.html [ Skip ]
> fullscreen [ Skip ]
> html5lib [ Skip ]
>-http/tests [ Skip ]
> http/wpt [ Skip ]
> imported/blink [ Skip ]
> imported/mozilla [ Skip ]
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e16c2a630fb..0bfaddf4bff 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-07-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Crash on synchronous request via ResourceHandle.
>+        https://bugs.webkit.org/show_bug.cgi?id=188033
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The timing of instantiation of delegate was wrong. Move it inside `delegate` getter().
>+        This bug was introduced at r228577.
>+
>+        Test: http/tests/xmlhttprequest/simple-sync.html
>+
>+        * platform/network/curl/ResourceHandleCurl.cpp:
>+        (WebCore::ResourceHandle::start):
>+        (WebCore::ResourceHandle::delegate):
>+
> 2018-07-25  Chris Dumez  <cdumez@apple.com>
> 
>         Allow ActiveDOMObject's canSuspend / suspend / resume overrides to destroy ActiveDOMObjects
>diff --git a/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp b/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
>index 6384d628909..55592cb7360 100644
>--- a/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
>+++ b/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
>@@ -66,9 +66,6 @@ bool ResourceHandle::start()
> 
>     CurlContext::singleton();
> 
>-    if (!d->m_delegate.get())
>-        d->m_delegate = std::make_unique<CurlResourceHandleDelegate>(*this);
>-
>     // The frame could be null if the ResourceHandle is not associated to any
>     // Frame, e.g. if we are downloading a file.
>     // If the frame is not null but the page is null this must be an attempted
>@@ -159,7 +156,9 @@ Ref<CurlRequest> ResourceHandle::createCurlRequest(ResourceRequest& request, Req
> 
> CurlResourceHandleDelegate* ResourceHandle::delegate()
> {
>-    ASSERT(d->m_delegate);
>+    if (!d->m_delegate)
>+        d->m_delegate = std::make_unique<CurlResourceHandleDelegate>(*this);
>+
>     return d->m_delegate.get();
> }
>

Flags:

Hironori.Fujii: review-
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188033: 345820 | 345826 | 345827 | 345830 | 345835 | 345844 | 345846 | 345858 | 345918 | 345925