Attachment 346763 Details for Bug 176803 – Patch

[patch] Patch

bug-176803-20180808121627.patch (text/plain), 3.99 KB, created by Ms2ger (he/him; ⌚ UTC+1/+2) on 2018-08-08 03:16:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ms2ger (he/him; ⌚ UTC+1/+2)

Created: 2018-08-08 03:16:28 PDT

Size: 3.99 KB

patch

obsolete

>Subversion Revision: 234359
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index bfef6390a7b391a9a7f5dd7cbb568021ed5ee4ad..aab3d07c011ac801949b10cf4e135bbe9ea65892 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-08  Ms2ger  <Ms2ger@igalia.com>
>+
>+        [SOUP] Check length before calling soup_message_body_append_buffer.
>+        https://bugs.webkit.org/show_bug.cgi?id=176803
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The function has a precondition that the buffer is non-empty.
>+
>+        Test: http/tests/local/blob/send-hybrid-blob-using-open-panel.html
>+
>+        * platform/network/soup/ResourceRequestSoup.cpp:
>+        (WebCore::appendEncodedBlobItemToSoupMessageBody):
>+        (WebCore::ResourceRequest::updateSoupMessageBody const):
>+
> 2018-07-28  Darin Adler  <darin@apple.com>
> 
>         [Cocoa] Update more WebCore Objective-C code to be ARC compatible
>diff --git a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>index 226aee9f00eba46acfe303d74d6da182c72c7eb5..ce9014ea98d59eddfbbd1e26dc60c2f4a29c6fc3 100644
>--- a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
>@@ -51,7 +51,8 @@ static uint64_t appendEncodedBlobItemToSoupMessageBody(SoupMessage* soupMessage,
> 
>         if (RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(blobItem.file()->path())) {
>             GUniquePtr<SoupBuffer> soupBuffer(buffer->createSoupBuffer(blobItem.offset(), blobItem.length() == BlobDataItem::toEndOfFile ? 0 : blobItem.length()));
>-            soup_message_body_append_buffer(soupMessage->request_body, soupBuffer.get());
>+            if (soupBuffer->length)
>+                soup_message_body_append_buffer(soupMessage->request_body, soupBuffer.get());
>             return soupBuffer->length;
>         }
>         break;
>@@ -79,7 +80,8 @@ void ResourceRequest::updateSoupMessageBody(SoupMessage* soupMessage) const
>             if (RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(element.m_filename)) {
>                 GUniquePtr<SoupBuffer> soupBuffer(buffer->createSoupBuffer());
>                 bodySize += buffer->size();
>-                soup_message_body_append_buffer(soupMessage->request_body, soupBuffer.get());
>+                if (soupBuffer->length)
>+                    soup_message_body_append_buffer(soupMessage->request_body, soupBuffer.get());
>             }
>             break;
>         case FormDataElement::Type::EncodedBlob:
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index dacc2475344135fb3d28d30c34ef8498b815ca84..9d09e5da8296e5c84122134bf5c764f1db8839bf 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-08-08  Ms2ger  <Ms2ger@igalia.com>
>+
>+        [SOUP] Check length before calling soup_message_body_append_buffer.
>+        https://bugs.webkit.org/show_bug.cgi?id=176803
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/gtk/TestExpectations: Enable test.
>+
> 2018-07-29  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [Curl] Test gardening
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index 3548b665d1fd4679850bd8f976e94b189d22473c..3ea6fee453c25935305a01c4ac1c5031a2b5b62f 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -1297,8 +1297,6 @@ webkit.org/b/172955 media/video-preload.html [ Crash Pass ]
> 
> webkit.org/b/175575 imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay-with-slow-text-tracks.html [ Crash Pass ]
> 
>-webkit.org/b/176803 http/tests/local/blob/send-hybrid-blob-using-open-panel.html [ Crash ]
>-
> # See also webkit.org/b/141699
> webkit.org/b/177534 fast/attachment/attachment-respects-css-size.html [ Crash ImageOnlyFailure ]
> # See also webkit.org/b/163528 Threaded compositor failures caused by one of r203496, r203497, or r203498

Actions: View | Formatted Diff | Diff

Attachments on bug 176803: 346763 | 347488