Changeset 274640 in webkit

Timestamp:

Mar 18, 2021, 4:12:35 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[SOUP] SOUP3 crashes inside soup_message_set_request_body
​https://bugs.webkit.org/show_bug.cgi?id=223236

Reviewed by Adrian Perez de Castro.

Make WebKitFormDataInputStream implement GPollableInputStream.

• platform/network/soup/WebKitFormDataInputStream.cpp:

(webkitFormDataInputStreamNew):
(webkitFormDataInputStreamCanPoll):
(webkitFormDataInputStreamIsReadable):
(webkitFormDataInputStreamCreateSource):
(webkitFormDataInputStreamPollableInterfaceInit):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/soup/WebKitFormDataInputStream.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] SOUP3 crashes inside soup_message_set_request_body
+        https://bugs.webkit.org/show_bug.cgi?id=223236
+
+        Reviewed by Adrian Perez de Castro.
+
+        Make WebKitFormDataInputStream implement GPollableInputStream.
+
+        * platform/network/soup/WebKitFormDataInputStream.cpp:
+        (webkitFormDataInputStreamNew):
+        (webkitFormDataInputStreamCanPoll):
+        (webkitFormDataInputStreamIsReadable):
+        (webkitFormDataInputStreamCreateSource):
+        (webkitFormDataInputStreamPollableInterfaceInit):
+
 2021-03-18  Lauro Moura  <lmoura@igalia.com>
 

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

@@ -38 +38 @@
     unsigned nextIndex;
     long long currentStreamRangeLength;
+    bool canPoll;
 };
 
-WEBKIT_DEFINE_TYPE(WebKitFormDataInputStream, webkit_form_data_input_stream, G_TYPE_INPUT_STREAM)
+static void webkitFormDataInputStreamPollableInterfaceInit(GPollableInputStreamInterface*);
+
+WEBKIT_DEFINE_TYPE_WITH_CODE(WebKitFormDataInputStream, webkit_form_data_input_stream, G_TYPE_INPUT_STREAM,
+    G_IMPLEMENT_INTERFACE(G_TYPE_POLLABLE_INPUT_STREAM, webkitFormDataInputStreamPollableInterfaceInit))
 
 static bool webkitFormDataInputStreamCreateNextStream(WebKitFormDataInputStream* stream, GCancellable* cancellable)
@@ -131 +135 @@
     stream->priv->currentStreamRangeLength = BlobDataItem::toEndOfFile;
 
+    // GFileInputStream is not pollable, so the stream is only pollable if FormData doesn't contain EncodedFileData elements.
+    stream->priv->canPoll = true;
+    for (const auto& element : stream->priv->formData->elements()) {
+        if (WTF::holds_alternative<FormDataElement::EncodedFileData>(element.data)) {
+            stream->priv->canPoll = false;
+            break;
+        }
+    }
+
     return adoptGRef(G_INPUT_STREAM((stream)));
 }
@@ -146 +159 @@
     return g_memory_output_stream_steal_as_bytes(G_MEMORY_OUTPUT_STREAM(outputStream.get()));
 }
+
+static gboolean webkitFormDataInputStreamCanPoll(GPollableInputStream* stream)
+{
+    auto* priv = WEBKIT_FORM_DATA_INPUT_STREAM(stream)->priv;
+    return priv->canPoll;
+}
+
+static gboolean webkitFormDataInputStreamIsReadable(GPollableInputStream* stream)
+{
+    auto* priv = WEBKIT_FORM_DATA_INPUT_STREAM(stream)->priv;
+    return priv->currentStream || priv->nextIndex < priv->formData->elements().size();
+}
+
+static GSource* webkitFormDataInputStreamCreateSource(GPollableInputStream* stream, GCancellable* cancellable)
+{
+    GRefPtr<GSource> base = adoptGRef(g_timeout_source_new(0));
+    return g_pollable_source_new_full(stream, base.get(), cancellable);
+}
+
+static void webkitFormDataInputStreamPollableInterfaceInit(GPollableInputStreamInterface* iface)
+{
+    iface->can_poll = webkitFormDataInputStreamCanPoll;
+    iface->is_readable = webkitFormDataInputStreamIsReadable;
+    iface->create_source = webkitFormDataInputStreamCreateSource;
+}