diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-19 19:14:37 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-19 19:14:37 +0000 |
commit | c47010813e8a6a13fa45da7d1e2b2fc0fe3192ed (patch) | |
tree | 8d52cf29614edada24af39477e958d4eee977aad /ast_expr2.fl | |
parent | af131944c7c43a1a33368de3a3e72c0c2aa0704c (diff) |
Bug 6072 - Memory leaks in the expression parser
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@8276 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'ast_expr2.fl')
-rw-r--r-- | ast_expr2.fl | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/ast_expr2.fl b/ast_expr2.fl index 9e198e7b2..af9bdf4eb 100644 --- a/ast_expr2.fl +++ b/ast_expr2.fl @@ -1,4 +1,9 @@ %{ +/*! \file + * + * \brief Dialplan Expression Parser + */ + #include <sys/types.h> #include <stdio.h> #include <stdlib.h> @@ -44,7 +49,7 @@ struct parse_io void ast_yyset_column(int column_no, yyscan_t yyscanner); int ast_yyget_column(yyscan_t yyscanner); - +static int curlycount = 0; %} %option prefix="ast_yy" @@ -54,6 +59,7 @@ int ast_yyget_column(yyscan_t yyscanner); %option bison-bridge %option bison-locations %option noyywrap +%x var trail %% @@ -75,6 +81,8 @@ int ast_yyget_column(yyscan_t yyscanner); \:\: { SET_COLUMNS; SET_STRING; return TOK_COLONCOLON;} \( { SET_COLUMNS; SET_STRING; return TOK_LP;} \) { SET_COLUMNS; SET_STRING; return TOK_RP;} +\$\{ {/* gather the contents of ${} expressions, with trailing stuff, into a single TOKEN. They are much more complex now than they used to be */ + curlycount = 0; BEGIN(var); yymore();} [ \r] {} \"[^"]*\" {SET_COLUMNS; SET_STRING; return TOKEN;} @@ -83,7 +91,14 @@ int ast_yyget_column(yyscan_t yyscanner); [0-9]+ { SET_COLUMNS; /* the original behavior of the expression parser was to bring in numbers as a numeric string */ SET_NUMERIC_STRING; return TOKEN;} -[a-zA-Z0-9,.';{}\\_^%$#@!]+ {SET_COLUMNS; SET_STRING; return TOKEN;} +[a-zA-Z0-9,.';\\_^%$#@!]+ {SET_COLUMNS; SET_STRING; return TOKEN;} + +<var>[^{}]*\} {curlycount--; if(curlycount < 0){ BEGIN(trail); yymore();} else { yymore();}} +<var>[^{}]*\{ {curlycount++; yymore(); } +<trail>[^-\t\r \n$():?%/+=*<>!|&]* {BEGIN(0); SET_COLUMNS; SET_STRING; return TOKEN;} +<trail>[-\t\r \n$():?%/+=*<>!|&] {char c = yytext[yyleng-1]; BEGIN(0); unput(c); SET_COLUMNS; SET_STRING; return TOKEN;} +<trail>\$\{ {curlycount = 0; BEGIN(var); yymore(); } +<trail><<EOF>> {BEGIN(0); SET_COLUMNS; SET_STRING; return TOKEN; /* actually, if an expr is only a variable ref, this could happen a LOT */} %% @@ -130,6 +145,7 @@ int ast_expr(char *expr, char *buf, int length) ast_copy_string(buf, io.val->u.s, length); #endif /* STANDALONE */ return_value = strlen(buf); + free(io.val->u.s); } free(io.val); } @@ -144,15 +160,6 @@ int ast_yyerror (const char *s, yyltype *loc, struct parse_io *parseio ) int i=0; spacebuf[0] = 0; -#ifdef WHEN_LOC_MEANS_SOMETHING - if( loc->first_column > 7990 ) /* if things get out of whack, why crash? */ - loc->first_column = 7990; - if( loc->last_column > 7990 ) - loc->last_column = 7990; - for(i=0;i<loc->first_column;i++) spacebuf[i] = ' '; - for( ;i<loc->last_column;i++) spacebuf[i] = '^'; - spacebuf[i] = 0; -#endif for(i=0;i< (int)(yytext - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);i++) spacebuf2[i] = ' '; /* uh... assuming yyg is defined, then I can use the yycolumn macro, which is the same thing as... get this: yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]->yy_bs_column |