diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-23 14:50:00 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-23 14:50:00 +0000 |
| commit | a3ec54c4887d2d56cead0f2989db51b59db20b41 (patch) | |
| tree | 4e53b9b1e9c4917ae362f2adcf3addb73c73e84c | |
| parent | f321994c503d378569f9cce2a3585a91ec7ee99a (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@225652 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ccbae398e..4cb323686 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, |