Changeset 275042 in webkit

Timestamp:

Mar 25, 2021, 10:06:29 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r274479 - [GTK][WPE] Stop using g_memdup
​https://bugs.webkit.org/show_bug.cgi?id=223189

Reviewed by Philippe Normand.

Source/WebCore:

Add gstBufferNewWrappedFast() to create a GstBuffer wrapping data allocated with fast malloc and use it when
possible in combination with fastMemDup() instead of g_memdup().

• platform/graphics/gstreamer/GStreamerCommon.cpp:

(WebCore::gstBufferNewWrappedFast):

• platform/graphics/gstreamer/GStreamerCommon.h:
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(CachedResourceStreamingClient::dataReceived):

• platform/mediastream/gstreamer/RealtimeIncomingAudioSourceLibWebRTC.cpp:

(WebCore::RealtimeIncomingAudioSourceLibWebRTC::OnData):

• platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp:

Source/WebKit:

• UIProcess/API/glib/WebKitWebResource.cpp:

(webkit_web_resource_get_data_finish): Use g_malloc + memcpy instead of g_memdup.

• UIProcess/API/glib/WebKitWebView.cpp:

(webkit_web_view_save_finish): Use fastMemDup instead g_memdup.

Source/WTF:

Add fastMemDup() to replace g_memdup() that is now deprecated in GLib because of the possibility of overflow
when converting from size_t to unsigned int. There's a replacement in GLib already, but we would need to depend
on very new GLib version, so better use fastMemDup() when possible. In cases where we still need to use GLib
allocator, we can simply call g_malloc() + memcpy().

• wtf/FastMalloc.cpp:

(WTF::fastMemDup):

• wtf/FastMalloc.h:

Location:

releases/WebKitGTK/webkit-2.32/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FastMalloc.cpp (modified) (1 diff)
• WTF/wtf/FastMalloc.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp (modified) (1 diff)
• WebCore/platform/graphics/gstreamer/GStreamerCommon.h (modified) (1 diff)
• WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (1 diff)
• WebCore/platform/mediastream/gstreamer/RealtimeIncomingAudioSourceLibWebRTC.cpp (modified) (2 diffs)
• WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/API/glib/WebKitWebResource.cpp (modified) (1 diff)
• WebKit/UIProcess/API/glib/WebKitWebView.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog

@@ +1 @@
+2021-03-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] Stop using g_memdup
+        https://bugs.webkit.org/show_bug.cgi?id=223189
+
+        Reviewed by Philippe Normand.
+
+        Add fastMemDup() to replace g_memdup() that is now deprecated in GLib because of the possibility of overflow
+        when converting from size_t to unsigned int. There's a replacement in GLib already, but we would need to depend
+        on very new GLib version, so better use fastMemDup() when possible. In cases where we still need to use GLib
+        allocator, we can simply call g_malloc() + memcpy().
+
+        * wtf/FastMalloc.cpp:
+        (WTF::fastMemDup):
+        * wtf/FastMalloc.h:
+
 2021-03-25  Alberto Garcia  <berto@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/FastMalloc.cpp

@@ -98 +98 @@
 }
 
+void* fastMemDup(const void* mem, size_t bytes)
+{
+    if (!mem || !bytes)
+        return nullptr;
+
+    void* result = fastMalloc(bytes);
+    memcpy(result, mem, bytes);
+    return result;
+}
+
 TryMallocReturnValue tryFastZeroedMalloc(size_t n) 
 {

releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/FastMalloc.h

@@ -94 +94 @@
 WTF_EXPORT_PRIVATE void* fastRealloc(void*, size_t) RETURNS_NONNULL;
 WTF_EXPORT_PRIVATE char* fastStrDup(const char*) RETURNS_NONNULL;
+WTF_EXPORT_PRIVATE void* fastMemDup(const void*, size_t);
 
 WTF_EXPORT_PRIVATE TryMallocReturnValue tryFastMalloc(size_t);
@@ -309 +310 @@
 using WTF::fastMallocGoodSize;
 using WTF::fastMallocSize;
+using WTF::fastMemDup;
 using WTF::fastRealloc;
 using WTF::fastStrDup;

releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] Stop using g_memdup
+        https://bugs.webkit.org/show_bug.cgi?id=223189
+
+        Reviewed by Philippe Normand.
+
+        Add gstBufferNewWrappedFast() to create a GstBuffer wrapping data allocated with fast malloc and use it when
+        possible in combination with fastMemDup() instead of g_memdup().
+
+        * platform/graphics/gstreamer/GStreamerCommon.cpp:
+        (WebCore::gstBufferNewWrappedFast):
+        * platform/graphics/gstreamer/GStreamerCommon.h:
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (CachedResourceStreamingClient::dataReceived):
+        * platform/mediastream/gstreamer/RealtimeIncomingAudioSourceLibWebRTC.cpp:
+        (WebCore::RealtimeIncomingAudioSourceLibWebRTC::OnData):
+        * platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp:
+
 2021-03-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp

@@ -504 +504 @@
 }
 
+GstBuffer* gstBufferNewWrappedFast(void* data, size_t length)
+{
+    return gst_buffer_new_wrapped_full(static_cast<GstMemoryFlags>(0), data, length, 0, length, data, fastFree);
+}
+
 }
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h

@@ -301 +301 @@
 });
 
+GstBuffer* gstBufferNewWrappedFast(void* data, size_t length);
+
 }
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

@@ -1124 +1124 @@
     checkUpdateBlocksize(length);
 
-    GstBuffer* buffer = gst_buffer_new_wrapped(g_memdup(data, length), length);
+    GstBuffer* buffer = gstBufferNewWrappedFast(fastMemDup(data, length), length);
     gst_adapter_push(members->adapter.get(), buffer);
     stopLoaderIfNeeded(src, members);

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/mediastream/gstreamer/RealtimeIncomingAudioSourceLibWebRTC.cpp

@@ -66 +66 @@
 
     auto bufferSize = GST_AUDIO_INFO_BPF(&info) * numberOfFrames;
-    gpointer bufferData = g_malloc(bufferSize);
+    gpointer bufferData = fastMalloc(bufferSize);
     if (muted())
         gst_audio_format_fill_silence(info.finfo, bufferData, bufferSize);
@@ -72 +72 @@
         memcpy(bufferData, audioData, bufferSize);
 
-    auto buffer = adoptGRef(gst_buffer_new_wrapped(bufferData, bufferSize));
+    auto buffer = adoptGRef(gstBufferNewWrappedFast(bufferData, bufferSize));
     auto caps = adoptGRef(gst_audio_info_to_caps(&info));
     auto sample = adoptGRef(gst_sample_new(buffer.get(), caps.get(), nullptr, nullptr));

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp

@@ -222 +222 @@
 
         // FIXME- Use a GstBufferPool.
-        auto buffer = adoptGRef(gst_buffer_new_wrapped(g_memdup(inputImage.data(), inputImage.size()),
+        auto buffer = adoptGRef(gstBufferNewWrappedFast(fastMemDup(inputImage.data(), inputImage.size()),
             inputImage.size()));
         GST_BUFFER_DTS(buffer.get()) = (static_cast<guint64>(inputImage.Timestamp()) * GST_MSECOND) - m_firstBufferDts;

releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] Stop using g_memdup
+        https://bugs.webkit.org/show_bug.cgi?id=223189
+
+        Reviewed by Philippe Normand.
+
+        * UIProcess/API/glib/WebKitWebResource.cpp:
+        (webkit_web_resource_get_data_finish): Use g_malloc + memcpy instead of g_memdup.
+        * UIProcess/API/glib/WebKitWebView.cpp:
+        (webkit_web_view_save_finish): Use fastMemDup instead g_memdup.
+
 2021-03-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/API/glib/WebKitWebResource.cpp

@@ -402 +402 @@
 guchar* webkit_web_resource_get_data_finish(WebKitWebResource* resource, GAsyncResult* result, gsize* length, GError** error)
 {
-    g_return_val_if_fail(WEBKIT_IS_WEB_RESOURCE(resource), 0);
-    g_return_val_if_fail(g_task_is_valid(result, resource), 0);
+    g_return_val_if_fail(WEBKIT_IS_WEB_RESOURCE(resource), nullptr);
+    g_return_val_if_fail(g_task_is_valid(result, resource), nullptr);
 
     GTask* task = G_TASK(result);
     if (!g_task_propagate_boolean(task, error))
-        return 0;
+        return nullptr;
 
     ResourceGetDataAsyncData* data = static_cast<ResourceGetDataAsyncData*>(g_task_get_task_data(task));
     if (length)
         *length = data->webData->size();
-    return static_cast<guchar*>(g_memdup(data->webData->bytes(), data->webData->size()));
-}
+
+    auto* bytes = data->webData->bytes();
+    if (!bytes || !data->webData->size())
+        return nullptr;
+
+    auto* returnValue = g_malloc(data->webData->size());
+    memcpy(returnValue, bytes, data->webData->size());
+    return static_cast<guchar*>(returnValue);
+}

releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp

@@ -4197 +4197 @@
     gsize length = data->webData->size();
     if (length)
-        g_memory_input_stream_add_data(G_MEMORY_INPUT_STREAM(dataStream), g_memdup(data->webData->bytes(), length), length, g_free);
+        g_memory_input_stream_add_data(G_MEMORY_INPUT_STREAM(dataStream), fastMemDup(data->webData->bytes(), length), length, fastFree);
 
     return dataStream;