[asterisk-commits] tilghman: branch 1.6.2 r272262 - in /branches/1.6.2: ./ res/ael/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Jun 23 16:09:20 2010
New Revision: 272262

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=272262
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/ael/ael.flex
    branches/1.6.2/res/ael/ael.tab.c
    branches/1.6.2/res/ael/ael.y
    branches/1.6.2/res/ael/ael_lex.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/res/ael/ael.flex
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/ael/ael.flex?view=diff&rev=272262&r1=272261&r2=272262
==============================================================================
--- branches/1.6.2/res/ael/ael.flex (original)
+++ branches/1.6.2/res/ael/ael.flex Wed Jun 23 16:09:20 2010
@@ -887,7 +887,7 @@
 			   	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)

Modified: branches/1.6.2/res/ael/ael.tab.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/ael/ael.tab.c?view=diff&rev=272262&r1=272261&r2=272262
==============================================================================
--- branches/1.6.2/res/ael/ael.tab.c (original)
+++ branches/1.6.2/res/ael/ael.tab.c Wed Jun 23 16:09:20 2010
@@ -3470,7 +3470,7 @@
 	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;
 }
 

Modified: branches/1.6.2/res/ael/ael.y
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/ael/ael.y?view=diff&rev=272262&r1=272261&r2=272262
==============================================================================
--- branches/1.6.2/res/ael/ael.y (original)
+++ branches/1.6.2/res/ael/ael.y Wed Jun 23 16:09:20 2010
@@ -854,7 +854,7 @@
 	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;
 }
 

Modified: branches/1.6.2/res/ael/ael_lex.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/ael/ael_lex.c?view=diff&rev=272262&r1=272261&r2=272262
==============================================================================
--- branches/1.6.2/res/ael/ael_lex.c (original)
+++ branches/1.6.2/res/ael/ael_lex.c Wed Jun 23 16:09:20 2010
@@ -3444,7 +3444,7 @@
 			   	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)