diff libpurple/buddyicon.c @ 24005:2ecdd0403dc1

Don't try to read data from a NULL filename in purple_buddy_icons_node_set_custom_icon_from_file. Also document that you can use NULL to unset the icon. Fixes #6998.

--- a/libpurple/buddyicon.c	Sun Sep 07 19:08:04 2008 +0000
+++ b/libpurple/buddyicon.c	Sun Sep 07 19:58:04 2008 +0000
@@ -934,8 +934,8 @@
 purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename)
 {
-	size_t len;
-	guchar *data;
+	size_t len = 0;
+	guchar *data = NULL;
 
 	g_return_val_if_fail(node != NULL, NULL);
 
@@ -945,8 +945,10 @@
 		return NULL;
 	}
 
-	if (!read_icon_file(filename, &data, &len)) {
-		return NULL;
+	if (filename != NULL) {
+		if (!read_icon_file(filename, &data, &len)) {
+			return NULL;
+		}
 	}
 
 	return purple_buddy_icons_node_set_custom_icon(node, data, len);