sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Russell Bryant 2008-07-15 18:46:40 +00:00
parent 49715c05f1
commit 5ac03d340f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_agi.c
View File

@ -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;