Attachment 345925 Details for Bug 188033 – Patch for landing

[patch] Patch for landing

188033.diff (text/plain), 3.02 KB, created by Basuke Suzuki on 2018-07-27 10:40:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-07-27 10:40:53 PDT

Size: 3.02 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 7ee24bd49ac..bd176b03e55 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-07-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Crash on synchronous request via ResourceHandle.
>+        https://bugs.webkit.org/show_bug.cgi?id=188033
>+
>+        Reviewed by Alex Christensen.
>+
>+        bug/188033 Crash sync xmlhttprequest
>+
>+        * platform/wincairo/TestExpectations:
>+
> 2018-07-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [Curl] Set correct source info to ResourceResponse.
>diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations
>index b55a8f0aa77..ac0a8549431 100644
>--- a/LayoutTests/platform/wincairo/TestExpectations
>+++ b/LayoutTests/platform/wincairo/TestExpectations
>@@ -928,7 +928,7 @@ http/tests/websocket/tests/hybi/websocket-cookie-overwrite-behavior.html [ Failu
> http/tests/workers [ Skip ]
> 
> http/tests/xmlhttprequest [ Skip ]
>-http/tests/xmlhttprequest/simple-sync.html [ Crash ]
>+http/tests/xmlhttprequest/simple-sync.html [ Pass ]
> 
> http/tests/xmlviewer [ Skip ]
> http/tests/xsl [ Skip ]
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 85bc6a1aef4..15caf44d6f1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-07-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Crash on synchronous request via ResourceHandle.
>+        https://bugs.webkit.org/show_bug.cgi?id=188033
>+
>+        Reviewed by Alex Christensen.
>+
>+        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-27  Chris Dumez  <cdumez@apple.com>
> 
>         [Media] Avoid unnecessarily constructing *TrackList objects
>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();
> }
>

Actions: View | Formatted Diff | Diff

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