gtk+ r20270 - branches/gtk-2-12/gdk-pixbuf

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jun  2 20:25:25 2008
New Revision: 20270
URL: http://svn.gnome.org/viewvc/gtk+?rev=20270&view=rev

Log:
        * gdk-pixbuf/gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Guard
        against NULL pointer. (#467051, Gian Mario Tagliaretti)



Modified:
   branches/gtk-2-12/gdk-pixbuf/ChangeLog
   branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c

Modified: branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c
==============================================================================
--- branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c	(original)
+++ branches/gtk-2-12/gdk-pixbuf/gdk-pixbuf-io.c	Mon Jun  2 20:25:25 2008
@@ -1300,6 +1300,8 @@
 	GdkPixbufModule *xpm_module;
 	gboolean locked;
 
+	g_return_val_if_fail (data != NULL, NULL);
+
 	xpm_module = _gdk_pixbuf_get_named_module ("xpm", &error);
 	if (xpm_module == NULL) {
 		g_warning ("Error loading XPM image loader: %s", error->message);