comparison libpurple/protocols/jabber/buddy.c @ 15627:0b16a4aa4e2b

Fixed 3 Jabber memory leaks: in jabber_roster_parse(), there's no need to g_strdup() this normalized jid since it's only used immediately, and there was no correspoding g_free(). When removing an id from jbi->ids, its data should always be freed. Finally, gaim_str_seconds_to_string() returns retained memory -- we must free the returned pointer when we're done using it.

15626:fc586f7f23bd

		} else {
			gaim_notify_user_info_add_pair(user_info, _("Status"), _("Unknown"));
		}
		if(jbir) {
			if(jbir->idle_seconds > 0) {
				gaim_notify_user_info_add_pair(user_info, _("Idle"), gaim_str_seconds_to_string(jbir->idle_seconds));
			}
		}
		if(jbr && jbr->client.name) {
			tmp = g_strdup_printf("%s%s%s", jbr->client.name,
								  (jbr->client.version ? " " : ""),

			if(jbr->name)
				jbir = g_hash_table_lookup(jbi->resources, jbr->name);

			if(jbir) {
				if(jbir->idle_seconds > 0) {
					gaim_notify_user_info_add_pair(user_info, _("Idle"), gaim_str_seconds_to_string(jbir->idle_seconds));
				}
			}
			if(jbr && jbr->client.name) {
				tmp = g_strdup_printf("%s%s%s", jbr->client.name,
									  (jbr->client.version ? " " : ""),

		return;

	while(l) {
		if(!strcmp(id, l->data)) {
			jbi->ids = g_slist_remove(jbi->ids, l->data);
			return;
		}
		l = l->next;
	}
}

15627:0b16a4aa4e2b

		} else {
			gaim_notify_user_info_add_pair(user_info, _("Status"), _("Unknown"));
		}
		if(jbir) {
			if(jbir->idle_seconds > 0) {
				char *idle = gaim_str_seconds_to_string(jbir->idle_seconds);
				gaim_notify_user_info_add_pair(user_info, _("Idle"), idle);
				g_free(idle);
			}
		}
		if(jbr && jbr->client.name) {
			tmp = g_strdup_printf("%s%s%s", jbr->client.name,
								  (jbr->client.version ? " " : ""),

			if(jbr->name)
				jbir = g_hash_table_lookup(jbi->resources, jbr->name);

			if(jbir) {
				if(jbir->idle_seconds > 0) {
					char *idle = gaim_str_seconds_to_string(jbir->idle_seconds);
					gaim_notify_user_info_add_pair(user_info, _("Idle"), idle);
					g_free(idle);
				}
			}
			if(jbr && jbr->client.name) {
				tmp = g_strdup_printf("%s%s%s", jbr->client.name,
									  (jbr->client.version ? " " : ""),

		return;

	while(l) {
		if(!strcmp(id, l->data)) {
			jbi->ids = g_slist_remove(jbi->ids, l->data);
			g_free(l->data);			
			return;
		}
		l = l->next;
	}
}