Merged revisions 123391 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r123391 | tilghman | 2008-06-17 13:56:53 -0500 (Tue, 17 Jun 2008) | 3 lines

Fix 3 more places where failure to lock the structure could cause the wrong lock to be
unlocked.  (Closes issue #12795)

........

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 9741fbb..fd33bd5 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9670,9 +9670,10 @@ static int iax2_do_register(struct iax2_registry *reg)
         * call has the pointer to IP and must be updated to the new one
         */
        if (reg->dnsmgr && ast_dnsmgr_changed(reg->dnsmgr) && (reg->callno > 0)) {
-               ast_mutex_lock(&iaxsl[reg->callno]);
-               iax2_destroy(reg->callno);
-               ast_mutex_unlock(&iaxsl[reg->callno]);
+               int callno = reg->callno;
+               ast_mutex_lock(&iaxsl[callno]);
+               iax2_destroy(callno);
+               ast_mutex_unlock(&iaxsl[callno]);
                reg->callno = 0;
        }
        if (!reg->addr.sin_addr.s_addr) {
@@ -10274,13 +10275,14 @@ static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr)
 static void peer_destructor(void *obj)
 {
        struct iax2_peer *peer = obj;
+       int callno = peer->callno;
 
        ast_free_ha(peer->ha);
 
-       if (peer->callno > 0) {
-               ast_mutex_lock(&iaxsl[peer->callno]);
-               iax2_destroy(peer->callno);
-               ast_mutex_unlock(&iaxsl[peer->callno]);
+       if (callno > 0) {
+               ast_mutex_lock(&iaxsl[callno]);
+               iax2_destroy(callno);
+               ast_mutex_unlock(&iaxsl[callno]);
        }
 
        register_peer_exten(peer, 0);
@@ -10789,12 +10791,13 @@ static void delete_users(void)
        while ((reg = AST_LIST_REMOVE_HEAD(&registrations, entry))) {
                AST_SCHED_DEL(sched, reg->expire);
                if (reg->callno) {
-                       ast_mutex_lock(&iaxsl[reg->callno]);
-                       if (iaxs[reg->callno]) {
-                               iaxs[reg->callno]->reg = NULL;
-                               iax2_destroy(reg->callno);
+                       int callno = reg->callno;
+                       ast_mutex_lock(&iaxsl[callno]);
+                       if (iaxs[callno]) {
+                               iaxs[callno]->reg = NULL;
+                               iax2_destroy(callno);
                        }
-                       ast_mutex_unlock(&iaxsl[reg->callno]);
+                       ast_mutex_unlock(&iaxsl[callno]);
                }
                if (reg->dnsmgr)
                        ast_dnsmgr_release(reg->dnsmgr);