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 ccbae398e86c521874ca55a57bac271e47d04729..4cb323686c4620f81f5e56faeb740459a6e9041d 100644 (file)
--- 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,