Attachment 358481 Details for Bug 193187 – Patch

[patch] Patch

bug-193187-20190107084055.patch (text/plain), 1.83 KB, created by Zan Dobersek on 2019-01-06 23:40:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2019-01-06 23:40:56 PST

Size: 1.83 KB

patch

obsolete

>Subversion Revision: 239667
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8c00641a45c657aa8d038db139ab69a77550f746..710095c3d3a4d52ffad10b807bc3db0f2b4232f5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-06  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        REGRESSION(r239636): ImageDecoder::setEncodedDataStatusChangeCallback() can be called on a null decoder
>+        https://bugs.webkit.org/show_bug.cgi?id=193187
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/graphics/ImageSource.cpp:
>+        (WebCore::ImageSource::ensureDecoderAvailable): Bail before calling the
>+        setEncodedDataStatusChangeCallback() method when the returned
>+        ImageDecoder object is null.
>+
> 2019-01-06  Zan Dobersek  <zdobersek@igalia.com>
> 
>         [Nicosia] Take over CoordinatedGraphics-named implementation of async scrolling classes
>diff --git a/Source/WebCore/platform/graphics/ImageSource.cpp b/Source/WebCore/platform/graphics/ImageSource.cpp
>index 5b015c899ba223935dfe1b59644b94d9acdde116..a872676f7fd5aa59e4a3cbbea5486d8adb41f347 100644
>--- a/Source/WebCore/platform/graphics/ImageSource.cpp
>+++ b/Source/WebCore/platform/graphics/ImageSource.cpp
>@@ -76,12 +76,13 @@ bool ImageSource::ensureDecoderAvailable(SharedBuffer* data)
>         return true;
> 
>     m_decoder = ImageDecoder::create(*data, mimeType(), m_alphaOption, m_gammaAndColorProfileOption);
>+    if (!isDecoderAvailable())
>+        return false;
>+
>     m_decoder->setEncodedDataStatusChangeCallback([weakThis = makeWeakPtr(this)] (auto status) {
>         if (weakThis)
>             weakThis->encodedDataStatusChanged(status);
>     });
>-    if (!isDecoderAvailable())
>-        return false;
> 
>     if (auto expectedContentSize = expectedContentLength())
>         m_decoder->setExpectedContentSize(expectedContentSize);

Actions: View | Formatted Diff | Diff

Attachments on bug 193187: 358481