gthumb r2504 - in branches/gthumb-2-10: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Fri Feb 13 18:04:38 2009
New Revision: 2504
URL: http://svn.gnome.org/viewvc/gthumb?rev=2504&view=rev

Log:
2009-02-13  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/gtk-utils.c: (panel_find_icon):
        Fix a possible crash. Patch taken from Fedora 2.10.10 source rpm,
        which I don't recall seeing upstream...



Modified:
   branches/gthumb-2-10/ChangeLog
   branches/gthumb-2-10/libgthumb/gtk-utils.c

Modified: branches/gthumb-2-10/libgthumb/gtk-utils.c
==============================================================================
--- branches/gthumb-2-10/libgthumb/gtk-utils.c	(original)
+++ branches/gthumb-2-10/libgthumb/gtk-utils.c	Fri Feb 13 18:04:38 2009
@@ -1018,10 +1018,14 @@
 						icon_no_extension,
 						size,
 						0);
-	retval = g_strdup (gtk_icon_info_get_filename (icon_info));
-
 	g_free (icon_no_extension);
-	gtk_icon_info_free (icon_info);
+
+        if (icon_info) {
+		retval = g_strdup (gtk_icon_info_get_filename (icon_info));
+		gtk_icon_info_free (icon_info);
+	}
+        else
+       		retval = NULL;
 
 	return retval;
 }