diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-10 14:51:09 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-10 14:51:09 +0000 |
| commit | e6c80725146f74e425ce3353b2074ba881df15c5 (patch) | |
| tree | 96ece190804ec5948ccb4b2f908f7ee7056e0c8c | |
| parent | 51c3b385c6ec9207da8db982a5aceaa731bee2f2 (diff) | |
Merged revisions 74265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r74265 | file | 2007-07-10 11:50:00 -0300 (Tue, 10 Jul 2007) | 10 lines
Merged revisions 74264 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r74264 | file | 2007-07-10 11:48:00 -0300 (Tue, 10 Jul 2007) | 2 lines
Ensure the group information category exists before trying to do a string comparison with it. (issue #10171 reported by mlegas)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@74266 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/app.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/app.c b/main/app.c index 53c0d1f0f..52536abc5 100644 --- a/main/app.c +++ b/main/app.c @@ -908,7 +908,7 @@ int ast_app_group_get_count(const char *group, const char *category) AST_RWLIST_RDLOCK(&groups); AST_RWLIST_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++; } AST_RWLIST_UNLOCK(&groups); @@ -931,7 +931,7 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category) AST_RWLIST_RDLOCK(&groups); AST_RWLIST_TRAVERSE(&groups, gi, list) { - if (!regexec(®exbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || !strcasecmp(gi->category, category))) + if (!regexec(®exbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) count++; } AST_RWLIST_UNLOCK(&groups); |