This is a fix for 2 things: a problem Terry was having in OSX with null pointers, which was my fault, as I probably forgot to run the sed script last time I made mods. So, I moved the fix into the flex input itself. Then, I found when I used flex 2.5.33, that it was using __STDC_VERSION__, and that's not real good; so I added back in a DIFFERENT sed script to fix that little mess. Tested everything, a couple different ways. Hope I did no harm, at the least.

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@97849 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 9 insertions, 0 deletions

diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index db09850b8..68db50428 100644
--- a/main/ast_expr2.fl
+++ b/main/ast_expr2.fl
@@ -99,6 +99,7 @@ static char *expr2_token_subst(const char *mess);
 %option bison-bridge
 %option bison-locations
 %option noyywrap
+%option noyyfree
 %x var trail
 
 %%
@@ -213,6 +214,14 @@ static char *expr2_token_subst(const char *mess);
 int ast_yyparse(void *); /* need to/should define this prototype for the call to yyparse */
 int ast_yyerror(const char *, YYLTYPE *, struct parse_io *); /* likewise */
 
+void ast_yyfree(void *ptr, yyscan_t yyscanner)
+{
+      if (ptr) /* the normal generated yyfree func just frees its first arg;
+                    this get complaints on some systems, as sometimes this
+                    arg is a nil ptr! It's usually not fatal, but is irritating! */
+              free( (char *) ptr );
+}
+
 int ast_expr(char *expr, char *buf, int length)
 {
 	struct parse_io io;