Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 25871:65cfc59858cf
propagate from branch 'im.pidgin.pidgin' (head d5bb29138cbe033bbfd8ec689203d73818765327)
to branch 'im.pidgin.pidgin.next.minor' (head 35ee8e40db640867e5b9239030cdc326e7f0a005)
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Sat, 13 Dec 2008 05:45:27 +0000 |
| parents | aa1fe87558d8 641fe4c2b2a5 |
| children |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Wed Dec 03 01:58:45 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Dec 13 05:45:27 2008 +0000 @@ -154,7 +154,7 @@ return NULL; if (strstr(input, "__HOSTNAME__") == NULL) - return input; + return g_strdup(input); /* Replace __HOSTNAME__ with hostname */ if (gethostname(hostname, sizeof(hostname) - 1)) { @@ -200,7 +200,7 @@ if (requested_resource != NULL) { resource = xmlnode_new_child(bind, "resource"); xmlnode_insert_data(resource, requested_resource, -1); - free(requested_resource); + g_free(requested_resource); } jabber_iq_set_callback(iq, jabber_bind_result_cb, NULL);