diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-19 02:45:05 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-19 02:45:05 +0000 |
| commit | cd5eb70dd8dd617755325490952db4a227d7283d (patch) | |
| tree | c3356311a08776da0bc53dc8a63f5735dc9a0c3d /funcs/func_callerid.c | |
| parent | ce5142548aec3232bfadef8268e433957adb5f25 (diff) | |
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/branches/1.4@61681 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_callerid.c')
| -rw-r--r-- | funcs/func_callerid.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c index 6068739d4..be3026325 100644 --- a/funcs/func_callerid.c +++ b/funcs/func_callerid.c @@ -43,7 +43,9 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data, { char *opt = data; - /* XXX we are not always clearing the buffer. Is this correct ? */ + if (!chan) + return -1; + if (strchr(opt, '|')) { char name[80], num[80]; @@ -98,7 +100,7 @@ static int callerid_read(struct ast_channel *chan, char *cmd, char *data, static int callerid_write(struct ast_channel *chan, char *cmd, char *data, const char *value) { - if (!value) + if (!value || !chan) return -1; if (!strncasecmp("all", data, 3)) { |