From b320319756d0b0954416c0460c19b2254e0bd059 Mon Sep 17 00:00:00 2001 From: dvossel Date: Wed, 2 Dec 2009 15:45:26 +0000 Subject: Merged revisions 232269 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r232269 | dvossel | 2009-12-02 09:42:54 -0600 (Wed, 02 Dec 2009) | 15 lines Merged revisions 232268 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r232268 | dvossel | 2009-12-02 09:41:36 -0600 (Wed, 02 Dec 2009) | 9 lines fixes segfault in func_groupcount closes issue #16337) Reported by: Parantido Patches: issue_16337.diff uploaded by dvossel (license 671) Tested by: Parantido, dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@232272 f38db490-d61c-443f-a65b-d21fe96a405b --- funcs/func_groupcount.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'funcs') diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index 47fb9eabf..a1b2864c9 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -137,6 +137,10 @@ static int group_function_write(struct ast_channel *chan, const char *cmd, { char grpcat[256]; + if (!value) { + return -1; + } + if (!ast_strlen_zero(data)) { snprintf(grpcat, sizeof(grpcat), "%s@%s", value, data); } else { -- cgit v1.2.3