Guard against NULL pointer. (#467051, Gian Mario Tagliaretti)

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)

svn path=/trunk/; revision=19929

diff --git a/ChangeLog b/ChangeLog
index 705ce561ae4b2c41692ba26059cc9bc3a6d26788..2ea261f2580da9011e65c1336c2d0fe6cd00b3a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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)
+
 2008-03-23  Cody Russell  <bratsche@gnome.org>
 
        * gdk/win32/gdkevents-win32.c (show_window_recurse):

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 9214ce4cd67812a965a11d43b499c25a635d3178..5a6f598503d8c11682d3e29848aec22c29a39fd5 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -1497,6 +1497,8 @@ gdk_pixbuf_new_from_xpm_data (const char **data)
        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);