Changeset 36047 in webkit

Timestamp:

Sep 2, 2008 11:22:12 PM (16 years ago)

Author:

mrowe@apple.com

Message:

2008-09-02 Mihnea Ovidenie <​mihnea@adobe.com>

Reviewed by Darin Adler.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=19964
Bug 19964: Divide by zero crash in RenderBox::calculateBackgroundSize with 0,0 bmp background image

Add a check to RenderBox::repaintLayerRectsForImage to make sure the current layer image can be rendered.

Test: css3/khtml-background-size-0x0-bmp.html

• rendering/RenderBox.cpp: (WebCore::RenderBox::repaintLayerRectsForImage):

2008-09-02 Mihnea Ovidenie <​mihnea@adobe.com>

Reviewed by Darin Adler.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=19964
Bug 19964: Divide by zero crash in RenderBox::calculateBackgroundSize with 0,0 bmp background image

• css3/khtml-background-size-0x0-bmp-expected.txt: Added.
• css3/khtml-background-size-0x0-bmp.html: Added.
• css3/support/0x0.bmp: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/khtml-background-size-0x0-bmp-expected.txt (added)
• LayoutTests/css3/khtml-background-size-0x0-bmp.html (added)
• LayoutTests/css3/support (added)
• LayoutTests/css3/support/0x0.bmp (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-09-02  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        Reviewed by Darin Adler.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=19964
+        Bug 19964: Divide by zero crash in RenderBox::calculateBackgroundSize with 0,0 bmp background image
+
+        * css3/khtml-background-size-0x0-bmp-expected.txt: Added.
+        * css3/khtml-background-size-0x0-bmp.html: Added.
+        * css3/support/0x0.bmp: Added.
+
 2008-09-02  Glenn Wilson  <wilsong@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-02  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=19964
+        Bug 19964: Divide by zero crash in RenderBox::calculateBackgroundSize with 0,0 bmp background image
+
+        Add a check to RenderBox::repaintLayerRectsForImage to make sure the current layer image can be rendered.
+
+        Test: css3/khtml-background-size-0x0-bmp.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::repaintLayerRectsForImage):
+
 2008-09-02  Glenn Wilson  <wilsong@gmail.com>
 

trunk/WebCore/rendering/RenderBox.cpp

@@ -558 +558 @@
 
     for (const FillLayer* curLayer = layers; curLayer; curLayer = curLayer->next()) {
-        if (curLayer->image() && image == curLayer->image()->data()) {
-        
+        if (curLayer->image() && image == curLayer->image()->data() && curLayer->image()->canRender(style()->effectiveZoom())) {
             // Now that we know this image is being used, compute the renderer and the rect
             // if we haven't already