kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-18 05:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs in the SIP tcp helper thread.

Browse Source 
- 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/trunk@105734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-04 20:36:16 +00:00
parent 7bf9f46774
commit 7b1e335999
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+9 -2
View File
@@ -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;
}