Changeset 235026 in webkit

Timestamp:

Aug 20, 2018 2:29:01 AM (6 years ago)

Author:

Ms2ger@igalia.com

Message:

[SOUP] Check length before calling soup_message_body_append_buffer.
​https://bugs.webkit.org/show_bug.cgi?id=176803

Reviewed by Carlos Garcia Campos.

Source/WebCore:

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):

LayoutTests:

• platform/gtk/TestExpectations: Enable test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-20  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 Carlos Garcia Campos.
+
+        * platform/gtk/TestExpectations: Enable test.
+
 2018-08-20  Rob Buis  <rbuis@igalia.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1270 +1270 @@
 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 ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-08-20  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 Carlos Garcia Campos.
+
+        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-08-20  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp

@@ -51 +51 @@
 
         if (RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(blobItem.file()->path())) {
+            if (buffer->isEmpty())
+                return 0;
+
             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;
         }
@@ -78 +82 @@
         case FormDataElement::Type::EncodedFile:
             if (RefPtr<SharedBuffer> buffer = SharedBuffer::createWithContentsOfFile(element.m_filename)) {
+                if (buffer->isEmpty())
+                    break;
+
                 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;