Mercurial > pidgin3 / changeset

--- a/libpurple/buddyicon.c	Tue May 25 00:06:32 2021 -0500
+++ b/libpurple/buddyicon.c	Tue May 25 02:03:21 2021 -0500
@@ -483,7 +483,7 @@
                                    const gchar *filename, GError **error)
 {
 	gconstpointer data;
-	size_t len;
+	size_t len = 0;
 
 	data = purple_buddy_icon_get_data(icon, &len);
 

--- a/libpurple/protocols/silc/ops.c	Tue May 25 00:06:32 2021 -0500
+++ b/libpurple/protocols/silc/ops.c	Tue May 25 02:03:21 2021 -0500
@@ -205,12 +205,14 @@
 		if (channel && !chat)
 			goto out;
 
-		img = purple_image_new_from_data(g_memdup2(data, data_len), data_len);
+		img = purple_image_new_from_data(data, data_len);
 		if (!img)
 			goto out;
 		img_id = purple_image_store_add_temporary(img);
-		if (!img_id)
+		if (!img_id) {
+			g_clear_object(&img);
 			goto out;
+		}
 
 		cflags |= PURPLE_MESSAGE_IMAGES | PURPLE_MESSAGE_RECV;
 		g_snprintf(tmp, sizeof(tmp), "<img src=\""
@@ -225,6 +227,8 @@
 				tmp, cflags, time(NULL));
 		}
 
+		g_clear_object(&img);
+
 		goto out;
 	}
 

--- a/pidgin/gtkblist.c	Tue May 25 00:06:32 2021 -0500
+++ b/pidgin/gtkblist.c	Tue May 25 02:03:21 2021 -0500
@@ -3272,7 +3272,7 @@
 		GList *cur = NULL;
 		PurpleProtocolChatEntry *pce;
 		char *name, *value;
-		PurpleChatConversation *conv;
+		PurpleChatConversation *conv = NULL;
 		PidginBlistNode *bnode = g_object_get_data(G_OBJECT(node), UI_DATA);
 
 		chat = (PurpleChat *)node;

--- a/pidgin/gtkconv.c	Tue May 25 00:06:32 2021 -0500
+++ b/pidgin/gtkconv.c	Tue May 25 02:03:21 2021 -0500
@@ -2717,7 +2717,6 @@
 	GtkTreePath *newpath;
 	const char *stock;
 	GtkTreeIter iter;
-	gboolean is_me = FALSE;
 	gboolean is_buddy;
 	const gchar *name, *alias;
 	gchar *tmp, *alias_key;
@@ -2741,9 +2740,6 @@
 
 	stock = get_chat_user_status_icon(chat, name, flags);
 
-	if (purple_strequal(purple_chat_conversation_get_nick(chat), purple_normalize(purple_conversation_get_account(conv), old_name != NULL ? old_name : name)))
-		is_me = TRUE;
-
 	is_buddy = purple_chat_user_is_buddy(cb);
 
 	tmp = g_utf8_casefold(alias, -1);