kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug 6072 - Memory leaks in the expression parser

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@8276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-01-19 19:14:37 +00:00
parent 74c149e891
commit c40fe2f71a
2 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ast_expr2.fl
View File

@@ -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