# HG changeset patch # User Paul Aurich # Date 1304399021 0 # Node ID c832d481d02138f6b49e583a72e28b3e98945d9d # Parent b2f6fec7b98e40105dd1aa5a7b9a68980c6f789f jabber: Tighter scoping diff -r b2f6fec7b98e -r c832d481d021 libpurple/protocols/jabber/presence.c --- a/libpurple/protocols/jabber/presence.c Tue May 03 05:02:00 2011 +0000 +++ b/libpurple/protocols/jabber/presence.c Tue May 03 05:03:41 2011 +0000 @@ -1210,12 +1210,12 @@ parse_vcard_avatar(JabberStream *js, JabberPresence *presence, xmlnode *x) { xmlnode *photo = xmlnode_get_child(x, "photo"); - char *hash_tmp; if (photo) { - g_free(presence->vcard_avatar_hash); + char *hash_tmp = xmlnode_get_data(photo); hash_tmp = xmlnode_get_data(photo); - presence->vcard_avatar_hash = + g_free(presence->vcard_avatar_hash); + presence->vcard_avatar_hash = hash_tmp ? hash_tmp : g_strdup(""); } }