diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-19 02:51:21 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-19 02:51:21 +0000 |
| commit | 1fc68129dcf103729cbcde5cf72742684aed5ca7 (patch) | |
| tree | 94d19b0213fbc581e070b6f908dd1993aa36d58a /funcs/func_cdr.c | |
| parent | a839730dbad7e57168da37653318ddd19b5bd421 (diff) | |
Merged revisions 61681 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r61681 | tilghman | 2007-04-18 21:45:05 -0500 (Wed, 18 Apr 2007) | 13 lines
Merged revisions 61680 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r61680 | tilghman | 2007-04-18 21:30:18 -0500 (Wed, 18 Apr 2007) | 5 lines
Bug 9557 - Specifying the GetVar AMI action without a Channel parameter can
cause Asterisk to crash. The reason this needs to be fixed in the functions
instead of in AMI is because Channel can legitimately be NULL, such as when
retrieving global variables.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@61682 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_cdr.c')
| -rw-r--r-- | funcs/func_cdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c index 4f1c457c0..951e980ae 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -59,7 +59,7 @@ static int cdr_read(struct ast_channel *chan, const char *cmd, char *parse, { char *ret; struct ast_flags flags = { 0 }; - struct ast_cdr *cdr = chan->cdr; + struct ast_cdr *cdr = chan ? chan->cdr : NULL; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(variable); AST_APP_ARG(options); @@ -96,7 +96,7 @@ static int cdr_write(struct ast_channel *chan, const char *cmd, char *parse, AST_APP_ARG(options); ); - if (ast_strlen_zero(parse) || !value) + if (ast_strlen_zero(parse) || !value || !chan) return -1; AST_STANDARD_APP_ARGS(args, parse); |