diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-02 15:43:27 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-02 15:43:27 +0000 |
| commit | f90daf6bbf09e75efb16ca102c46f5dd53e980e4 (patch) | |
| tree | 18eae9cd58c1332df3e8741e0fc0e2d19cc39fd9 | |
| parent | 2d256221531ce44f4593e950410509c3bd5208a8 (diff) | |
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.2@232270 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | funcs/func_groupcount.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index ecb927467..cfa91c090 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -194,6 +194,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 { |