diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 21:09:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-23 21:09:20 +0000 |
| commit | ab509857d5962eacade3c2bacdeb43496e50b2f4 (patch) | |
| tree | d6296c383f144b785f334c1f032d135a88cf5d50 /res | |
| parent | 715995777c419492239e0001a66114331c117391 (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')
| -rw-r--r-- | res/ael/ael.flex | 2 | ||||
| -rw-r--r-- | res/ael/ael.tab.c | 2 | ||||
| -rw-r--r-- | res/ael/ael.y | 2 | ||||
| -rw-r--r-- | res/ael/ael_lex.c | 2 |
4 files changed, 4 insertions, 4 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) diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c index cbe9d8c33..4d44d44f3 100644 --- a/res/ael/ael.tab.c +++ b/res/ael/ael.tab.c @@ -3470,7 +3470,7 @@ struct pval *npval(pvaltype type, int first_line, int last_line, z->endline = last_line; z->startcol = first_column; z->endcol = last_column; - z->filename = strdup(my_file); + z->filename = strdup(S_OR(my_file, "<none>")); return z; } diff --git a/res/ael/ael.y b/res/ael/ael.y index c8bc9c78e..27e04c583 100644 --- a/res/ael/ael.y +++ b/res/ael/ael.y @@ -854,7 +854,7 @@ struct pval *npval(pvaltype type, int first_line, int last_line, z->endline = last_line; z->startcol = first_column; z->endcol = last_column; - z->filename = strdup(my_file); + z->filename = strdup(S_OR(my_file, "<none>")); return z; } diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c index 6517644bd..02d8f82e4 100644 --- a/res/ael/ael_lex.c +++ b/res/ael/ael_lex.c @@ -3444,7 +3444,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) |