isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

harden against null return from gdk_pixmap_foreign_new. Fix for #116923.

Browse Source 
2003-08-29  Rob Adams  <robadams@ucla.edu>

	* src/ui.c (meta_gdk_pixbuf_get_from_pixmap): harden against null
	return from gdk_pixmap_foreign_new.  Fix for #116923.
This commit is contained in:
Rob Adams 2003-08-30 01:48:31 +00:00 committed by Rob Adams
parent a4a32a54c3
commit 9ddacb019e
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-08-29 Rob Adams <robadams@ucla.edu>
* src/ui.c (meta_gdk_pixbuf_get_from_pixmap): harden against null
return from gdk_pixmap_foreign_new. Fix for #116923.
2003-08-26 Guntupalli Karunakar <karunakar@freedomink.org> 2003-08-26 Guntupalli Karunakar <karunakar@freedomink.org>
* configure.in: Added "hi" (Hindi) to ALL_LINGUAS. * configure.in: Added "hi" (Hindi) to ALL_LINGUAS.

21
src/ui.c
View File

@ -523,18 +523,21 @@ meta_gdk_pixbuf_get_from_pixmap (GdkPixbuf *dest,
else else
drawable = gdk_pixmap_foreign_new (xpixmap); drawable = gdk_pixmap_foreign_new (xpixmap);
cmap = get_cmap (drawable); if (drawable)
{
retval = gdk_pixbuf_get_from_drawable (dest, cmap = get_cmap (drawable);
drawable,
cmap,
src_x, src_y,
dest_x, dest_y,
width, height);
retval = gdk_pixbuf_get_from_drawable (dest,
drawable,
cmap,
src_x, src_y,
dest_x, dest_y,
width, height);
}
if (cmap) if (cmap)
g_object_unref (G_OBJECT (cmap)); g_object_unref (G_OBJECT (cmap));
g_object_unref (G_OBJECT (drawable)); if (drawable)
g_object_unref (G_OBJECT (drawable));
return retval; return retval;
} }