[svn-commits] dvossel: branch 1.6.1 r225652 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri Oct 23 09:50:00 2009
New Revision: 225652

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

........
  r225650 | dvossel | 2009-10-23 09:41:50 -0500 (Fri, 23 Oct 2009) | 3 lines
  
  Fixes an iterator memory leak and uninitialized memory
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=225652&r1=225651&r2=225652
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Oct 23 09:50:00 2009
@@ -13437,6 +13437,7 @@
 			(th->tcptls_session->client ? "Client" : "Server"));
 		ao2_t_ref(th, -1, "decrement ref from iterator");
 	}
+	ao2_iterator_destroy(&i);
 	return CLI_SUCCESS;
 #undef FORMAT
 #undef FORMAT2
@@ -20851,7 +20852,7 @@
 {
 	struct sip_socket *s = &p->socket;
 	static const char name[] = "SIP socket";
-	struct sip_threadinfo *th;
+	struct sip_threadinfo *th = NULL;
 	struct ast_tcptls_session_instance *tcptls_session;
 	struct ast_tcptls_session_args tmp_ca = {
 		.name = name,