aboutsummaryrefslogtreecommitdiffstats
path: root/res/ael/ael.flex
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-23 21:09:20 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-23 21:09:20 +0000
commitab509857d5962eacade3c2bacdeb43496e50b2f4 (patch)
treed6296c383f144b785f334c1f032d135a88cf5d50 /res/ael/ael.flex
parent715995777c419492239e0001a66114331c117391 (diff)
Merged revisions 272260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r272260 | tilghman | 2010-06-23 16:06:40 -0500 (Wed, 23 Jun 2010) | 8 lines Ensure a NULL file while debugging cannot crash AEL. (closes issue #17215) Reported by: vazir Patches: 20100518__issue17215.diff.txt uploaded by tilghman (license 14) Tested by: tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272262 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/ael/ael.flex')
-rw-r--r--res/ael/ael.flex2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/ael/ael.flex b/res/ael/ael.flex
index 0674ba8ff..4d441fb73 100644
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -887,7 +887,7 @@ static void setup_filestack(char *fnamebuf2, int fnamebuf_siz, glob_t *globbuf,
free(include_stack[include_stack_index].fname);
include_stack[include_stack_index].fname = 0;
}
- include_stack[include_stack_index].fname = strdup(my_file);
+ include_stack[include_stack_index].fname = strdup(S_OR(my_file, "<none>"));
include_stack[include_stack_index].lineno = my_lineno;
include_stack[include_stack_index].colno = my_col+yyleng;
if (my_file)