Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Ensure the group information category exists before trying to do a string comparison with it. (issue #10171 reported by mlegas)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@74264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2
Joshua Colp 19 years ago
parent 319b105e17
commit abcb24bd12
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
app.c
Unescape View File

@ -1084,7 +1084,7 @@ int ast_app_group_get_count(char *group, char *category)
AST_LIST_LOCK(&groups); AST_LIST_LOCK(&groups);
AST_LIST_TRAVERSE(&groups, gi, list) { AST_LIST_TRAVERSE(&groups, gi, list) {
if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category))))
count++; count++;
} }
AST_LIST_UNLOCK(&groups); AST_LIST_UNLOCK(&groups);
@ -1107,7 +1107,7 @@ int ast_app_group_match_get_count(char *groupmatch, char *category)
AST_LIST_LOCK(&groups); AST_LIST_LOCK(&groups);
AST_LIST_TRAVERSE(&groups, gi, list) { AST_LIST_TRAVERSE(&groups, gi, list) {
if (!regexec(&regexbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) if (!regexec(&regexbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category))))
count++; count++;
} }
AST_LIST_UNLOCK(&groups); AST_LIST_UNLOCK(&groups);

Write Preview
Loading…
Cancel
Save