Merged revisions 114608 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 24 Apr 2008 15:56:55 +0000 (15:56 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 24 Apr 2008 15:56:55 +0000 (15:56 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114608 | russell | 2008-04-24 10:55:21 -0500 (Thu, 24 Apr 2008) | 4 lines

Fix a silly mistake in a change I made yesterday that caused chan_iax2 to blow
up very quickly.
(issue #12515)

........

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

channels/chan_iax2.c

index 1eb018a..ab13d26 100644 (file)
@@ -1507,7 +1507,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
                                        res = x;
                                }
                        }
-                       if (res && !return_locked)
+                       if (!res || (res && !return_locked))
                                ast_mutex_unlock(&iaxsl[x]);
                }
                for (x=TRUNK_CALL_START;(res < 1) && (x<maxtrunkcall);x++) {
@@ -1518,7 +1518,7 @@ static int __find_callno(unsigned short callno, unsigned short dcallno, struct s
                                        res = x;
                                }
                        }
-                       if (res && !return_locked)
+                       if (!res || (res && !return_locked))
                                ast_mutex_unlock(&iaxsl[x]);
                }
        }