aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorphsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-21 10:02:32 +0000
committerphsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-21 10:02:32 +0000
commit85ae59a36469c86cf8ccca8e4e4eca7d9a72dffb (patch)
tree7c6ffc75d0d7e1c1b43c45dda29b47a05aeb65ed /channels
parent2bec1768de2e2b5a3d24632592e551242550fee2 (diff)
Merged revisions 139281 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r139281 | phsultan | 2008-08-21 11:55:31 +0200 (Thu, 21 Aug 2008) | 5 lines Fix two memory leaks in chan_gtalk, thanks Eliel! (closes issue #13310) Reported by: eliel Patches: chan_gtalk.c.patch uploaded by eliel (license 64) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139282 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_gtalk.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 2509599ba..b833af52e 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -1616,6 +1616,7 @@ static struct ast_channel *gtalk_request(const char *type, int format, void *dat
client->connection = ast_aji_get_client(sender);
if (!client->connection) {
ast_log(LOG_ERROR, "No XMPP client to talk to, us (partial JID) : %s\n", sender);
+ ASTOBJ_UNREF(client, gtalk_member_destroy);
return NULL;
}
}
@@ -1948,6 +1949,7 @@ static int gtalk_load_config(void)
ASTOBJ_UNLOCK(iterator);
});
ASTOBJ_CONTAINER_LINK(&gtalk_list, member);
+ ASTOBJ_UNREF(member, gtalk_member_destroy);
} else {
ASTOBJ_UNLOCK(member);
ASTOBJ_UNREF(member, gtalk_member_destroy);