Mercurial > pidgin3 / changeset

--- a/libpurple/http.c	Thu Mar 21 21:30:31 2019 -0500
+++ b/libpurple/http.c	Fri Mar 22 02:42:46 2019 +0000
@@ -41,6 +41,8 @@
 
 #define PURPLE_HTTP_PROGRESS_WATCHER_DEFAULT_INTERVAL 250000
 
+#define PURPLE_HTTP_GET_ACCOUNT(gc) (gc ? purple_connection_get_account(gc) : NULL)
+
 typedef struct _PurpleHttpSocket PurpleHttpSocket;
 
 typedef struct _PurpleHttpHeaders PurpleHttpHeaders;
@@ -567,8 +569,7 @@
 	GSocketClient *client;
 	GError *error = NULL;
 
-	client = purple_gio_socket_client_new(
-			purple_connection_get_account(gc), &error);
+	client = purple_gio_socket_client_new(PURPLE_HTTP_GET_ACCOUNT(gc), &error);
 
 	if (client == NULL) {
 		purple_debug_error("http", "Error connecting to '%s:%d': %s",
@@ -869,8 +870,7 @@
 	req = hc->request;
 	url = hc->url;
 	hdrs = req->headers;
-	proxy = purple_proxy_get_setup(hc->gc ?
-		purple_connection_get_account(hc->gc) : NULL);
+	proxy = purple_proxy_get_setup(PURPLE_HTTP_GET_ACCOUNT(hc->gc));
 
 	proxy_http = (purple_proxy_info_get_proxy_type(proxy) == PURPLE_PROXY_HTTP ||
 		purple_proxy_info_get_proxy_type(proxy) == PURPLE_PROXY_USE_ENVVAR);

--- a/libpurple/protocols/gg/roster.c	Thu Mar 21 21:30:31 2019 -0500
+++ b/libpurple/protocols/gg/roster.c	Fri Mar 22 02:42:46 2019 +0000
@@ -755,9 +755,8 @@
 static const gchar * ggp_roster_send_update_group_add(
 	ggp_roster_content *content, PurpleGroup *group)
 {
-	gchar *id_dyn;
+	gchar *id;
 	const char *id_existing, *group_name;
-	static gchar id[40];
 	PurpleXmlNode *group_node;
 	gboolean succ = TRUE;
 
@@ -773,9 +772,7 @@
 	purple_debug_info("gg", "ggp_roster_send_update_group_add: adding %s\n",
 		purple_group_get_name(group));
 
-	id_dyn = purple_uuid_random();
-	g_snprintf(id, sizeof(id), "%s", id_dyn);
-	g_free(id_dyn);
+	id = purple_uuid_random();
 
 	group_node = purple_xmlnode_new_child(content->groups_node, "Group");
 	succ &= ggp_xml_set_string(group_node, "Id", id);
@@ -786,7 +783,7 @@
 
 	g_hash_table_insert(content->group_ids, g_strdup(group_name),
 		g_strdup(id));
-	g_hash_table_insert(content->group_nodes, g_strdup(id), group_node);
+	g_hash_table_replace(content->group_nodes, id, group_node);
 
 	g_return_val_if_fail(succ, NULL);
 

--- a/libpurple/protocols/jabber/data.c	Thu Mar 21 21:30:31 2019 -0500
+++ b/libpurple/protocols/jabber/data.c	Fri Mar 22 02:42:46 2019 +0000
@@ -43,25 +43,21 @@
 {
 	JabberData *data;
 	gchar *checksum;
-	gchar cid[256]; /* "Big enough" for a SHA1 hex hash value */
 
 	g_return_val_if_fail(rawdata != NULL, NULL);
 	g_return_val_if_fail(size > 0, NULL);
 	g_return_val_if_fail(type != NULL, NULL);
 
-	data = g_new0(JabberData, 1);
 	checksum = g_compute_checksum_for_data(G_CHECKSUM_SHA1, rawdata, size);
 
-	g_snprintf(cid, sizeof(cid), "sha1+%s@bob.xmpp.org", checksum);
-	g_free(checksum);
-
-	data->cid = g_strdup(cid);
+	data = g_new0(JabberData, 1);
+	data->cid = g_strdup_printf("sha1+%s@bob.xmpp.org", checksum);
 	data->type = g_strdup(type);
 	data->size = size;
 	data->ephemeral = ephemeral;
-
 	data->data = g_memdup(rawdata, size);
 
+	g_free(checksum);
 	return data;
 }
 

--- a/libpurple/protocols/silc/chat.c	Thu Mar 21 21:30:31 2019 -0500
+++ b/libpurple/protocols/silc/chat.c	Fri Mar 22 02:42:46 2019 +0000
@@ -387,7 +387,8 @@
 	SilcUInt32 pk_len;
 	char *fingerprint, *babbleprint;
 	SilcPublicKeyIdentifier ident;
-	char tmp2[1024], t[512];
+	char tmp2[1024];
+	const gchar *t;
 	PurpleRequestFields *fields;
 	PurpleRequestFieldGroup *g;
 	PurpleRequestField *f;
@@ -417,12 +418,11 @@
 	purple_request_field_group_add_field(g, f);
 	purple_request_fields_add_group(fields, g);
 
-	g_snprintf(t, sizeof(t),
-		   _("Channel authentication is used to secure the channel from "
-		     "unauthorized access. The authentication may be based on "
-		     "passphrase and digital signatures. If passphrase is set, it "
-		     "is required to be able to join. If channel public keys are set "
-		     "then only users whose public keys are listed are able to join."));
+	t = _("Channel authentication is used to secure the channel from "
+	      "unauthorized access. The authentication may be based on "
+	      "passphrase and digital signatures. If passphrase is set, it "
+	      "is required to be able to join. If channel public keys are set "
+	      "then only users whose public keys are listed are able to join.");
 
 	if (!channel_pubkeys || !silc_dlist_count(channel_pubkeys)) {
 		f = purple_request_field_list_new("list", NULL);
@@ -509,7 +509,7 @@
 silcpurple_chat_prv_add(SilcPurpleCharPrv p, PurpleRequestFields *fields)
 {
 	SilcPurple sg = p->sg;
-	char tmp[512];
+	gchar *tmp;
 	PurpleRequestField *f;
 	const char *name, *passphrase, *alias;
 	GHashTable *comp;
@@ -528,9 +528,9 @@
 	alias = purple_request_field_string_get_value(f);
 
 	/* Add private group to buddy list */
-	g_snprintf(tmp, sizeof(tmp), "%s [Private Group]", name);
+	tmp = g_strdup_printf("%s [Private Group]", name);
 	comp = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
-	g_hash_table_replace(comp, "channel", g_strdup(tmp));
+	g_hash_table_replace(comp, "channel", tmp);
 	g_hash_table_replace(comp, "passphrase", g_strdup(passphrase));
 
 	cn = purple_chat_new(sg->account, alias, comp);