pidgin: d3a76f1c: at least don't crash when we can't read ...

khc at pidgin.im khc at pidgin.im
Fri Aug 1 22:46:00 EDT 2008


-----------------------------------------------------------------
Revision: d3a76f1c86220df41fa903d3d4153e57d619ba72
Ancestor: f4ca035a974fcedf0fd43abcef21ba050baf4208
Author: khc at pidgin.im
Date: 2008-08-02T02:40:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d3a76f1c86220df41fa903d3d4153e57d619ba72

Modified files:
        pidgin/gtksmiley.c

ChangeLog: 

at least don't crash when we can't read whatever we are reading

Ref #6468


-------------- next part --------------
============================================================
--- pidgin/gtksmiley.c	7507e39acdf11d00e737b2237df98cd2cf4b3a27
+++ pidgin/gtksmiley.c	12efe3d2fed126090d1122baf42ab70b21abc190
@@ -275,7 +275,8 @@ static void do_add(GtkWidget *widget, Pi
 			g_free(buffer);
 		}
 		emoticon = purple_smiley_new_from_file(entry, s->filename);
-		pidgin_smiley_add_to_list(emoticon);
+		if (emoticon)
+			pidgin_smiley_add_to_list(emoticon);
 	}
 
 	if (smiley_manager != NULL)


More information about the Commits mailing list