Changeset 81589 in webkit

Timestamp:

Mar 21, 2011 10:11:00 AM (13 years ago)

Author:

christian@webkit.org

Message:

WebKitIconDatabase may trigger crash in cairoImageSurfaceToGdkPixbuf
​https://bugs.webkit.org/show_bug.cgi?id=56201

Reviewed by Martin Robinson.

• platform/graphics/gtk/ImageGtk.cpp: Don't attempt to make a pixbuf

if there is no image.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/ImageGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-21  Christian Dywan  <christian@lanedo.com>
+
+        Reviewed by Martin Robinson.
+
+        WebKitIconDatabase may trigger crash in cairoImageSurfaceToGdkPixbuf
+        https://bugs.webkit.org/show_bug.cgi?id=56201
+
+        * platform/graphics/gtk/ImageGtk.cpp: Don't attempt to make a pixbuf
+            if there is no image.
+
 2011-03-21  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp

@@ -153 +153 @@
 GdkPixbuf* BitmapImage::getGdkPixbuf()
 {
-    return cairoImageSurfaceToGdkPixbuf(frameAtIndex(currentFrame()));
+    cairo_surface_t* frame = frameAtIndex(currentFrame());
+    if (!frame)
+        return 0;
+    return cairoImageSurfaceToGdkPixbuf(frame);
 }