[asterisk-commits] phsultan: branch 1.6.0 r112822 - in /branches/1.6.0: ./ channels/chan_gtalk.c

[SVN commits to the Asterisk project]

Author: phsultan
Date: Fri Apr  4 14:30:35 2008
New Revision: 112822

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112822
Log:
Merged revisions 112821 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r112821 | phsultan | 2008-04-04 21:28:49 +0200 (Fri, 04 Apr 2008) | 9 lines

Merged revisions 112820 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r112820 | phsultan | 2008-04-04 21:26:15 +0200 (Fri, 04 Apr 2008) | 1 line

Free newly allocated channel before returning
........

................

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=112822&r1=112821&r2=112822
==============================================================================
--- branches/1.6.0/channels/chan_gtalk.c (original)
+++ branches/1.6.0/channels/chan_gtalk.c Fri Apr  4 14:30:35 2008
@@ -1177,10 +1177,11 @@
 		ast_log(LOG_WARNING, "Capabilities don't match : us - %s, peer - %s, combined - %s \n", ast_getformatname_multiple(s1, BUFSIZ, p->capability),
 			ast_getformatname_multiple(s2, BUFSIZ, p->peercapability),
 			ast_getformatname_multiple(s3, BUFSIZ, p->jointcapability));
-			/* close session if capabilities don't match */
+		/* close session if capabilities don't match */
 		gtalk_action(client, p, "reject");
 		p->alreadygone = 1;
 		gtalk_hangup(chan);
+		ast_channel_free(chan);
 		return -1;
 	}