From 3a859720f2200b148e80c507b9f8234fa79ac114 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Wed, 2 Dec 2009 15:45:26 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@232272 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_groupcount.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index 47fb9eabf3..a1b2864c9f 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 { -- 2.47.2