AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 689982: Random Crash

Browse Source 
Update Cairo_Win32 error handling to respond correctly to
cairo_win32_foo_create() functions returning a "nil" surface.
This commit is contained in:
John Ralls 2012-12-10 09:32:00 -08:00
parent 4a8df7a33c
commit e8535149e4
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/win32/gdkpixmap-win32.c
View File

@ -221,7 +221,8 @@ _gdk_pixmap_new (GdkDrawable *drawable,
if (depth != 15 && depth != 16) if (depth != 15 && depth != 16)
{ {
dib_surface = cairo_win32_surface_create_with_dib (format, width, height); dib_surface = cairo_win32_surface_create_with_dib (format, width, height);
if (dib_surface == NULL) if (dib_surface == NULL ||
cairo_surface_status (dib_surface) != CAIRO_STATUS_SUCCESS)
{ {
g_object_unref ((GObject *) pixmap); g_object_unref ((GObject *) pixmap);
return NULL; return NULL;
@ -234,7 +235,18 @@ _gdk_pixmap_new (GdkDrawable *drawable,
/* Get the bitmap from the cairo hdc */ /* Get the bitmap from the cairo hdc */
hbitmap = GetCurrentObject (hdc, OBJ_BITMAP); hbitmap = GetCurrentObject (hdc, OBJ_BITMAP);
/* Cairo_win32_surface_get_image() returns NULL on failure, but
this is likely an oversight and future versions will return a
"nil" surface.
*/
image_surface = cairo_win32_surface_get_image (dib_surface); image_surface = cairo_win32_surface_get_image (dib_surface);
if (image_surface == NULL ||
cairo_surface_status (image_surface) != CAIRO_STATUS_SUCCESS)
{
cairo_surface_destroy (dib_surface);
g_object_unref ((GObject*) pixmap);
return NULL;
}
bits = cairo_image_surface_get_data (image_surface); bits = cairo_image_surface_get_data (image_surface);
} }
else else