From 178bf85812ba426aba887157e0dbc5ab26b61561 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 30 Nov 2014 22:52:20 +0100 Subject: scanner: don't bug on too large values Add a new ERROR symbol to handle scanning of too large values. :1:36-99: Error: bad value '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' add rule ip test-ip4 input ct mark 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ instead of: BUG: nft: scanner.l:470: nft_lex: Assertion `0' failed. Signed-off-by: Pablo Neira Ayuso --- src/parser_bison.y | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src/parser_bison.y') diff --git a/src/parser_bison.y b/src/parser_bison.y index ad2951a1..6c7a036a 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -209,7 +209,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token NUM "number" %token STRING "string" %token QUOTED_STRING -%destructor { xfree($$); } STRING QUOTED_STRING +%token ERROR "error" +%destructor { xfree($$); } STRING QUOTED_STRING ERROR %token LL_HDR "ll" %token NETWORK_HDR "nh" @@ -465,6 +466,8 @@ static void location_update(struct location *loc, struct location *rhs, int n) %destructor { expr_free($$); } list_expr %type concat_expr map_lhs_expr %destructor { expr_free($$); } concat_expr map_lhs_expr +%type error_expr +%destructor { expr_free($$); } error_expr %type map_expr %destructor { expr_free($$); } map_expr @@ -1668,6 +1671,16 @@ expr : concat_expr | set_expr | map_expr | multiton_expr + | error_expr + ; + +error_expr : ERROR + { + $$ = NULL; + erec_queue(error(&@1, "bad value '%s'", $1), + state->msgs); + YYERROR; + } ; set_expr : '{' set_list_expr '}' -- cgit v1.2.3