From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 24 Apr 2008 15:56:55 +0000 (+0000)
Subject: Merged revisions 114608 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~2394
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bb98b63d8c199129c3430a8445230240715e68f;p=thirdparty%2Fasterisk.git

Merged revisions 114608 via svnmerge from
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
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1eb018af0c..ab13d26110 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -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]);
 		}
 	}