From f5a23304954b13755e50216c70ce563885da277f Mon Sep 17 00:00:00 2001 From: russell Date: Tue, 15 Jul 2008 18:46:40 +0000 Subject: [PATCH] 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: http://svn.digium.com/svn/asterisk/trunk@131072 614ede4d-c843-0410-af14-a771ab80d22e --- res/res_agi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/res/res_agi.c b/res/res_agi.c index b509ef67d..0f59855f5 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; -- 2.11.4.GIT