From: David Vossel <dvossel@digium.com>
Date: Fri, 23 Oct 2009 14:50:00 +0000 (+0000)
Subject: Merged revisions 225650 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dd2ce2ace2fe8dadc7c7eaa306ae9b93accdf0e;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@225652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ccbae398e8..4cb323686c 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13437,6 +13437,7 @@ static char *sip_show_tcp(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 			(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 @@ static int sip_prepare_socket(struct sip_pvt *p)
 {
 	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,