callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Björn Lindqvist
2008-03-23 18:27:03 +00:00
committed by Björn Lindqvist
parent ca2987a0f9
commit 8fce9eab79
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2008-03-23 Cody Russell <bratsche@gnome.org>
* gdk/win32/gdkevents-win32.c (show_window_recurse): * gdk/win32/gdkevents-win32.c (show_window_recurse):

2
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -1497,6 +1497,8 @@ gdk_pixbuf_new_from_xpm_data (const char **data)
GdkPixbufModule *xpm_module; GdkPixbufModule *xpm_module;
gboolean locked; gboolean locked;
g_return_val_if_fail (data != NULL, NULL);
xpm_module = _gdk_pixbuf_get_named_module ("xpm", &error); xpm_module = _gdk_pixbuf_get_named_module ("xpm", &error);
if (xpm_module == NULL) { if (xpm_module == NULL) {
g_warning ("Error loading XPM image loader: %s", error->message); g_warning ("Error loading XPM image loader: %s", error->message);