From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 15 Jul 2008 18:46:40 +0000 (+0000)
Subject: Fix a couple of places in res_agi where the agi_commands lock would not be
X-Git-Tag: 1.6.2.0-beta1~1675
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ac03d340f6457ecdab6a077d85f0edff7b23b83;p=thirdparty%2Fasterisk.git

Fix a couple of places in res_agi where the agi_commands lock would not be
released, causing a deadlock.  (Reported by mvanbaak in #asterisk-dev,
discovered by bbryant's change to the lock tracking code to yell at you
if a thread exits with a lock still held)


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

diff --git a/res/res_agi.c b/res/res_agi.c
index b509ef67d7..0f59855f5f 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2434,8 +2434,10 @@ static agi_command *find_command(char *cmds[], int exact)
 			if (!e->cmda[y] && !exact)
 				break;
 			/* don't segfault if the next part of a command doesn't exist */
-			if (!e->cmda[y])
+			if (!e->cmda[y]) {
+				AST_RWLIST_UNLOCK(&agi_commands);
 				return NULL;
+			}
 			if (strcasecmp(e->cmda[y], cmds[y]))
 				match = 0;
 		}
@@ -2443,8 +2445,10 @@ static agi_command *find_command(char *cmds[], int exact)
 		   a candidate (unless we're looking for a really inexact answer  */
 		if ((exact > -1) && e->cmda[y])
 			match = 0;
-		if (match)
+		if (match) {
+			AST_RWLIST_UNLOCK(&agi_commands);
 			return e;
+		}
 	}
 	AST_RWLIST_UNLOCK(&agi_commands);
 	return NULL;