From: Joshua Colp <jcolp@digium.com>
Date: Tue, 10 Jul 2007 14:48:00 +0000 (+0000)
Subject: Ensure the group information category exists before trying to do a string comparison... 
X-Git-Tag: 1.2.21.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abcb24bd1227eb81111c9a01d88f95e2232bda54;p=thirdparty%2Fasterisk.git

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


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

diff --git a/app.c b/app.c
index 33b318dd2c..9d1849c776 100644
--- a/app.c
+++ b/app.c
@@ -1084,7 +1084,7 @@ int ast_app_group_get_count(char *group, char *category)
 
 	AST_LIST_LOCK(&groups);
 	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++;
 	}
 	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_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++;
 	}
 	AST_LIST_UNLOCK(&groups);