Merged revisions 97697 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 10 Jan 2008 15:12:08 +0000 (15:12 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 10 Jan 2008 15:12:08 +0000 (15:12 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97697 | file | 2008-01-10 11:07:12 -0400 (Thu, 10 Jan 2008) | 6 lines

Don't try to copy the category from the group if no category exists.
(closes issue #11724)
Reported by: IgorG
Patches:
      group_count.v1.patch uploaded by IgorG (license 20)

........

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

funcs/func_groupcount.c

index a447695..f0d7df1 100644 (file)
@@ -53,7 +53,8 @@ static int group_count_function_read(struct ast_channel *chan, const char *cmd,
                }
                if (gi) {
                        ast_copy_string(group, gi->group, sizeof(group));
-                       ast_copy_string(category, gi->category, sizeof(category));
+                       if (!ast_strlen_zero(gi->category))
+                               ast_copy_string(category, gi->category, sizeof(category));
                }
                ast_app_group_list_unlock();
        }