Attachment 273214 Details for Bug 111179 – Patch

[patch] Patch

bug-111179-20160307143838.patch (text/plain), 2.55 KB, created by Martin Robinson on 2016-03-07 14:38:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Robinson

Created: 2016-03-07 14:38:52 PST

Size: 2.55 KB

patch

obsolete

>Subversion Revision: 196772
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a1f20acca9e35c8ad222af0af608e62a658c8487..0cbbe7558596f6aeb601b63d72b05ca29f1980e9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2016-03-07  Martin Robinson  <mrobinson@igalia.com>
>+
>+        [Cairo] Surface pointer passed to asNewNativeImage() might be freed.
>+        https://bugs.webkit.org/show_bug.cgi?id=111179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests. This issue is incredibly illusive and I haven't been
>+        able to reproduce it locally. It depends very much on the network speed
>+        and the size of the animated GIF. The code in question seems obviously
>+        wrong.
>+
>+        When producing frames from decoded GIFs, copy the memory of the decoded
>+        frame and properly free it. This is a speculative fix for a very hard
>+        to reproduce issue.
>+
>+        * platform/image-decoders/cairo/ImageDecoderCairo.cpp:
>+        (WebCore::ImageFrame::asNewNativeImage): Copy the memory when producing frames
>+        from decoded images. It might disappear at any time and then the image will
>+        be corrupt.
>+
> 2016-02-18  Brady Eidson  <beidson@apple.com>
> 
>         Modern IDB: Implement client->server operations in WK2.
>diff --git a/Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp b/Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp
>index 3fe704023419d9753b1399d9f6c00b6739451296..c33af858dfafb801396a09c81da4bcfa0d8ae3a0 100644
>--- a/Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp
>+++ b/Source/WebCore/platform/image-decoders/cairo/ImageDecoderCairo.cpp
>@@ -32,9 +32,19 @@ namespace WebCore {
> 
> PassNativeImagePtr ImageFrame::asNewNativeImage() const
> {
>-    return adoptRef(cairo_image_surface_create_for_data(
>-        reinterpret_cast<unsigned char*>(const_cast<PixelData*>(m_bytes)),
>+    PixelData* copiedData = static_cast<PixelData*>(fastMalloc(width() * height() * sizeof(PixelData)));
>+    memcpy(copiedData, m_bytes, width() * height() * sizeof(PixelData));
>+
>+    RefPtr<cairo_surface_t> nativeImage = adoptRef(cairo_image_surface_create_for_data(
>+        reinterpret_cast<unsigned char*>(const_cast<PixelData*>(copiedData)),
>         CAIRO_FORMAT_ARGB32, width(), height(), width() * sizeof(PixelData)));
>+
>+    static cairo_user_data_key_t decodedImageKey;
>+    cairo_surface_set_user_data(nativeImage.get(), &decodedImageKey, copiedData, [](void* data) {
>+        fastFree(data);
>+    });
>+
>+    return nativeImage;
> }
> 
> } // namespace WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 111179: 190964 | 192693 | 229057 | 229059 | 233153 | 233200 | 258593 | 273214 | 273528