diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-25 21:00:50 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-25 21:00:50 +0000 |
| commit | f268d815f558e72c74da6ca83dd5f1d3e46e81d0 (patch) | |
| tree | c8d513eb1b9616a46f3b7298ee6626b477ee2ef2 /main/ast_expr2.fl | |
| parent | 4b6504d8b49e10f95126c9e0bc0fa4716ae6e7dd (diff) | |
This patch completes the fixes nec. to make 1.4 asterisk dialplan expressions ($[...]) 8-bit transparent
While I was updating ast_expr2.fl, I missed one rule that would allow 8-bit chars to be caught
in tokens; and in so doing, it absorbs the ${ sequence and messes up the
checking of raw exprs by AEL.
Trunk already has these changes.
(closes issue #14543)
Reported by: klaus3000
Patches:
patch.14543 uploaded by murf (license 17)
Tested by: murf
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@178640 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2.fl')
| -rw-r--r-- | main/ast_expr2.fl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index f503740e8..b258726a1 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -91,8 +91,8 @@ int ast_yyget_column(yyscan_t yyscanner); static int curlycount = 0; static char *expr2_token_subst(const char *mess); %} - %option prefix="ast_yy" +%option 8bit %option batch %option outfile="ast_expr2f.c" %option reentrant @@ -152,7 +152,7 @@ HIBIT [\x80-\xff] return TOKEN; } -[a-zA-Z0-9,.';\\_^$#@{HIBIT}]+ { +([a-zA-Z0-9\.';\\_^#@]|{HIBIT}|($[^{]))+ { SET_COLUMNS; SET_STRING; return TOKEN; |