comparison libpurple/protocols/yahoo/libymsg.c @ 27517:b00f138c850a

Fix denying auth requests from MSN buddies, and fix a leak.

27516:4fc04d98e1e8

yahoo_buddy_add_deny_cb(struct yahoo_add_request *add_req, const char *msg)
{
	struct yahoo_data *yd = add_req->gc->proto_data;
	struct yahoo_packet *pkt;
	char *encoded_msg = NULL;
	PurpleAccount *account = purple_connection_get_account(add_req->gc);

	if (msg && *msg)
		encoded_msg = yahoo_string_encode(add_req->gc, msg, NULL);

	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15,
			YAHOO_STATUS_AVAILABLE, 0);

	yahoo_packet_hash(pkt, "ssiiis",
			1, purple_normalize(account, purple_account_get_username(account)),
			5, add_req->who,
			13, 2,
			334, 0,
			97, 1,
			14, encoded_msg ? encoded_msg : "");

			struct yahoo_pair *pair = l->data;

			switch (pair->key) {
			case 4:
				temp = pair->value;
				add_req->who = g_strdup(pair->value);
				break;
			case 5:
				add_req->id = g_strdup(pair->value);
				break;
			case 14:

27517:b00f138c850a

yahoo_buddy_add_deny_cb(struct yahoo_add_request *add_req, const char *msg)
{
	struct yahoo_data *yd = add_req->gc->proto_data;
	struct yahoo_packet *pkt;
	char *encoded_msg = NULL;
	const char *who = add_req->who;

	if (add_req->protocol == 2)
		who += 4; /* Skip 'msn/' */

	if (msg && *msg)
		encoded_msg = yahoo_string_encode(add_req->gc, msg, NULL);

	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15,
			YAHOO_STATUS_AVAILABLE, 0);

	yahoo_packet_hash(pkt, "ssiiiis",
			1, add_req->id,
			5, who,
			241, add_req->protocol,
			13, 2,
			334, 0,
			97, 1,
			14, encoded_msg ? encoded_msg : "");

			struct yahoo_pair *pair = l->data;

			switch (pair->key) {
			case 4:
				temp = pair->value;
				break;
			case 5:
				add_req->id = g_strdup(pair->value);
				break;
			case 14: