Changeset 259024 in webkit

Timestamp:

Mar 25, 2020 5:28:36 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

CanvasRenderingContext2D.putImageData() should not process neutered ImageData
​https://bugs.webkit.org/show_bug.cgi?id=208303

Patch by Pinki Gyanchandani <​pgyanchandani@apple.com> on 2020-03-25
Reviewed by Said Abou-Hallawa.

Source/WebCore:

Test: fast/canvas/canvas-putImageData-neutered-ImageData.html

The crash happens when putImageData is called on a neutered ImageData object.
Added a check to exit from CanvasRenderingContext2D.putImageData() function when ImageData object is neutered.

• html/canvas/CanvasRenderingContext2DBase.cpp:

(WebCore::CanvasRenderingContext2DBase::putImageData):

LayoutTests:

Added slightly modified version of testcase from bugzilla.
This testcase checks that a neutered ImageData object is not considered to be put onto the canvas.

• fast/canvas/canvas-putImageData-neutered-ImageData-expected.txt: Added.
• fast/canvas/canvas-putImageData-neutered-ImageData.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-putImageData-neutered-ImageData-expected.txt (added)
• LayoutTests/fast/canvas/canvas-putImageData-neutered-ImageData.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-25  Pinki Gyanchandani  <pgyanchandani@apple.com>
+
+        CanvasRenderingContext2D.putImageData() should not process neutered ImageData
+        https://bugs.webkit.org/show_bug.cgi?id=208303
+
+        Reviewed by Said Abou-Hallawa.
+
+        Added slightly modified version of testcase from bugzilla.
+        This testcase checks that a neutered ImageData object is not considered to be put onto the canvas.
+
+        * fast/canvas/canvas-putImageData-neutered-ImageData-expected.txt: Added.
+        * fast/canvas/canvas-putImageData-neutered-ImageData.html: Added.
+
 2020-03-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-25  Pinki Gyanchandani  <pgyanchandani@apple.com>
+
+        CanvasRenderingContext2D.putImageData() should not process neutered ImageData
+        https://bugs.webkit.org/show_bug.cgi?id=208303
+
+        Reviewed by Said Abou-Hallawa.
+
+        Test: fast/canvas/canvas-putImageData-neutered-ImageData.html
+
+        The crash happens when putImageData is called on a neutered ImageData object. 
+        Added a check to exit from CanvasRenderingContext2D.putImageData() function when ImageData object is neutered.
+
+        * html/canvas/CanvasRenderingContext2DBase.cpp:
+        (WebCore::CanvasRenderingContext2DBase::putImageData):
+
 2020-03-25  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp

@@ -2160 +2160 @@
         return;
 
-    if (!data.data())
+    if (!data.data() || data.data()->isNeutered())
         return;