Attachment 340848 Details for Bug 185819 – Patch

[patch] Patch

wk2-crash.diff (text/plain), 2.02 KB, created by Carlos Garcia Campos on 2018-05-21 06:28:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2018-05-21 06:28:07 PDT

Size: 2.02 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 457d02fec58..96256293382 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-05-21  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        Crash when loading a SVG image
>+        https://bugs.webkit.org/show_bug.cgi?id=185819
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is happening in WebLoaderStrategy::scheduleLoad() when getting the value of
>+        FrameLoaderClient::pageID(). SVGImage uses the empty clients for the loader, and
>+        EmptyFrameLoaderClient::pageID() returns std::nullopt. The same happens with the frameID. This changed in
>+        r225934, when pageID() and frameID() were changed to return std::optional, EmptyFrameLoaderClient was updated to
>+        return std::nullopt instead of 0.
>+
>+        * WebProcess/Network/WebLoaderStrategy.cpp:
>+        (WebKit::WebLoaderStrategy::scheduleLoad): Use value_or(0) instead of value() to get pageID and frameID from
>+        FrameLoaderClient.
>+
> 2018-05-21  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK][Wayland] UI process crash when closing the window
>diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>index 63aebcca4a5..dd1deea963b 100644
>--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>@@ -156,8 +156,8 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
>     auto& frameLoaderClient = resourceLoader.frameLoader()->client();
> 
>     WebResourceLoader::TrackingParameters trackingParameters;
>-    trackingParameters.pageID = frameLoaderClient.pageID().value();
>-    trackingParameters.frameID = frameLoaderClient.frameID().value();
>+    trackingParameters.pageID = frameLoaderClient.pageID().value_or(0);
>+    trackingParameters.frameID = frameLoaderClient.frameID().value_or(0);
>     trackingParameters.resourceID = identifier;
>     auto sessionID = frameLoaderClient.sessionID();
>

Flags:

bfulgham: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185819: 340848