diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-10 03:53:30 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-10 03:53:30 +0000 |
| commit | abf42442c73b86ffd5b65a969f883d6db386e9e5 (patch) | |
| tree | 90202e14517001e9117e61990ef81ccebdb749d2 /main | |
| parent | 96b4b4cec6c27f17c65c5b44b5cfb5a2af70c56e (diff) | |
Merged revisions 50266 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r50266 | file | 2007-01-09 22:51:29 -0500 (Tue, 09 Jan 2007) | 2 lines
Ensure data's existence before trying to access it. (issue #8774 reported by rcourtna)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@50267 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 151a791a4..198f3b390 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1631,7 +1631,7 @@ static void pbx_substitute_variables(char *passdata, int datalen, struct ast_cha memset(passdata, 0, datalen); /* No variables or expressions in e->data, so why scan it? */ - if (!strchr(e->data, '$') && !strstr(e->data,"${") && !strstr(e->data,"$[") && !strstr(e->data,"$(")) { + if (e->data && !strchr(e->data, '$') && !strstr(e->data,"${") && !strstr(e->data,"$[") && !strstr(e->data,"$(")) { ast_copy_string(passdata, e->data, datalen); return; } |