From c6f570d433226de21eea2dc0806a0f7bc3bff6f0 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 6 Mar 2008 00:10:33 +0000 Subject: [PATCH] Merged revisions 105734 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r105734 | russell | 2008-03-04 14:36:16 -0600 (Tue, 04 Mar 2008) | 6 lines Fix some bugs in the SIP tcp helper thread. - fix a spot where a lock wouldn't get unlocked in an error condition - call ast_mutex_destroy() on the lock before freeing its memory (related to issue #11972) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106302 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d894e8255a..777bd07bf8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2200,8 +2200,10 @@ static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct server_instance while (req.len < 4 || strncmp((char *)&req.data + req.len - 4, "\r\n\r\n", 4)) { if (req.socket.lock) ast_mutex_lock(req.socket.lock); - if (!fgets(buf, sizeof(buf), ser->f)) + if (!fgets(buf, sizeof(buf), ser->f)) { + ast_mutex_unlock(req.socket.lock); goto cleanup; + } if (req.socket.lock) ast_mutex_unlock(req.socket.lock); if (me->stop) @@ -2237,7 +2239,12 @@ cleanup: cleanup2: fclose(ser->f); ast_free(ser); - ast_free(req.socket.lock); + + if (req.socket.lock) { + ast_mutex_destroy(req.socket.lock); + ast_free(req.socket.lock); + req.socket.lock = NULL; + } return NULL; }