gtk+ r19929 - in trunk: . gdk-pixbuf

[bjornl svn gnome org]

Author: bjornl
Date: Sun Mar 23 18:27:03 2008
New Revision: 19929
URL: http://svn.gnome.org/viewvc/gtk+?rev=19929&view=rev

Log:
2008-03-23  BjÃrn Lindqvist  <bjourne gmail com>

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



Modified:
   trunk/ChangeLog
   trunk/gdk-pixbuf/gdk-pixbuf-io.c

Modified: trunk/gdk-pixbuf/gdk-pixbuf-io.c
==============================================================================
--- trunk/gdk-pixbuf/gdk-pixbuf-io.c	(original)
+++ trunk/gdk-pixbuf/gdk-pixbuf-io.c	Sun Mar 23 18:27:03 2008
@@ -1497,6 +1497,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);