[svn-commits] phsultan: branch 1.6.0 r139282 - in /branches/1.6.0: ./ channels/chan_gtalk.c

[SVN commits to the Digium repositories]

Author: phsultan
Date: Thu Aug 21 05:02:32 2008
New Revision: 139282

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139282
Log:
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)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_gtalk.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_gtalk.c?view=diff&rev=139282&r1=139281&r2=139282
==============================================================================
--- branches/1.6.0/channels/chan_gtalk.c (original)
+++ branches/1.6.0/channels/chan_gtalk.c Thu Aug 21 05:02:32 2008
@@ -1616,6 +1616,7 @@
 		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 @@
 						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);