Attachment 341910 Details for Bug 186276 – Patch

[patch] Patch

bug-186276-20180604145220.patch (text/plain), 1.69 KB, created by Michael Catanzaro on 2018-06-04 12:52:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-06-04 12:52:20 PDT

Size: 1.69 KB

patch

obsolete

>Subversion Revision: 232457
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index eaa082cceb5e276f71fa5e9a137a7ee98d7cf84f..efca1c0d32ccfe37fa7bff7407e31b22560c7be3 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-04  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK] webkit_web_resource_get_data_finish can return NULL without setting error
>+        https://bugs.webkit.org/show_bug.cgi?id=186276
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Set the error parameter when the main resource data is unavailable.
>+
>+        * UIProcess/API/glib/WebKitWebResource.cpp:
>+        (resourceDataCallback):
>+
> 2018-06-03  Brent Fulgham  <bfulgham@apple.com>
> 
>         Make sure that the fencePort received over IPC has the expected disposition (SEND)
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp
>index 7beabb07f3a9ba5af3c64ec5d252c4a2af85af33..81dc80f0b6fd2b343fc81d914a5618fb0bbfb44f 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp
>@@ -349,8 +349,14 @@ static void resourceDataCallback(API::Data* wkData, CallbackBase::Error error, G
>         g_task_return_new_error(task, G_IO_ERROR, G_IO_ERROR_CANCELLED, _("Operation was cancelled"));
>         return;
>     }
>+
>     ResourceGetDataAsyncData* data = static_cast<ResourceGetDataAsyncData*>(g_task_get_task_data(task));
>     data->webData = wkData;
>+    if (!wkData->size()) {
>+        g_task_return_new_error(task, G_IO_ERROR, G_IO_ERROR_FAILED, _("Resource data unavailable"));
>+        return;
>+    }
>+
>     g_task_return_boolean(task, TRUE);
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186276: 341910 | 356934 | 366083