From 9d0fee73a38b519630ac685eb9ecff01de8158c0 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 18 Sep 2013 07:46:07 +0200 Subject: [PATCH] Fix memory leaks in the config parser. --- lib/config/config_parser.cc | 598 +++++++++++++++++++----------------- lib/config/config_parser.yy | 24 ++ 2 files changed, 334 insertions(+), 288 deletions(-) diff --git a/lib/config/config_parser.cc b/lib/config/config_parser.cc index cc017346b..e0a7970e3 100644 --- a/lib/config/config_parser.cc +++ b/lib/config/config_parser.cc @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "2.7.12-4996" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,21 +58,21 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 1 /* Copy the first part of user declarations. */ +/* Line 371 of yacc.c */ +#line 68 "config_parser.cc" -/* Line 268 of yacc.c */ -#line 71 "../../../lib/config/config_parser.cc" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -82,14 +82,19 @@ # define YYERROR_VERBOSE 1 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_YY_CONFIG_PARSER_HH_INCLUDED +# define YY_YY_CONFIG_PARSER_HH_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; #endif - /* "%code requires" blocks. */ - -/* Line 288 of yacc.c */ +/* Line 387 of yacc.c */ #line 1 "config_parser.yy" /****************************************************************************** @@ -135,9 +140,8 @@ using namespace icinga; - -/* Line 288 of yacc.c */ -#line 141 "../../../lib/config/config_parser.cc" +/* Line 387 of yacc.c */ +#line 145 "config_parser.cc" /* Tokens. */ #ifndef YYTOKENTYPE @@ -213,12 +217,10 @@ using namespace icinga; - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 293 of yacc.c */ +/* Line 387 of yacc.c */ #line 54 "config_parser.yy" char *text; @@ -232,9 +234,8 @@ typedef union YYSTYPE Array *array; - -/* Line 293 of yacc.c */ -#line 238 "../../../lib/config/config_parser.cc" +/* Line 387 of yacc.c */ +#line 239 "config_parser.cc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -255,9 +256,24 @@ typedef struct YYLTYPE #endif -/* Copy the second part of user declarations. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (ConfigCompiler *context); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ -/* Line 343 of yacc.c */ +#endif /* !YY_YY_CONFIG_PARSER_HH_INCLUDED */ + +/* Copy the second part of user declarations. */ +/* Line 390 of yacc.c */ #line 119 "config_parser.yy" @@ -290,9 +306,8 @@ void ConfigCompiler::Compile(void) #define scanner (context->GetScanner()) - -/* Line 343 of yacc.c */ -#line 296 "../../../lib/config/config_parser.cc" +/* Line 390 of yacc.c */ +#line 311 "config_parser.cc" #ifdef short # undef short @@ -345,24 +360,33 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif + /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -398,6 +422,7 @@ YYID (yyi) # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif @@ -491,20 +516,20 @@ union yyalloc #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ while (YYID (0)) # endif # endif @@ -623,12 +648,12 @@ static const yytype_uint16 yyrline[] = 393, 396, 402, 411, 415, 421, 424, 430, 442, 448, 462, 463, 464, 465, 466, 472, 478, 482, 488, 491, 506, 526, 531, 535, 539, 549, 554, 559, 563, 568, - 575, 579, 583, 587, 591, 595, 599, 603, 609, 610, - 615 + 578, 585, 592, 599, 606, 613, 620, 627, 633, 634, + 639 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 1 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -655,7 +680,7 @@ static const char *const yytname[] = "object_inherits_list", "object_inherits_specifier", "expressionlist", "expressions", "expressions_inner", "expression", "operator", "array", "array_items", "array_items_inner", "simplevalue", "constterm", - "constexpression", "value", 0 + "constexpression", "value", YY_NULL }; #endif @@ -786,10 +811,10 @@ static const yytype_int16 yytable[] = 0, 0, 13 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-30)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-30))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int8 yycheck[] = @@ -859,23 +884,24 @@ static const yytype_uint8 yystos[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (&yylloc, context, YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 @@ -884,27 +910,28 @@ while (YYID (0)) If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ while (YYID (0)) #endif +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) + /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know @@ -912,10 +939,46 @@ while (YYID (0)) #ifndef YY_LOCATION_PRINT # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) + +/* Print *YYLOCP on YYO. Private, do not rely on its existence. */ + +__attribute__((__unused__)) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static unsigned +yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) +#else +static unsigned +yy_location_print_ (yyo, yylocp) + FILE *yyo; + YYLTYPE const * const yylocp; +#endif +{ + unsigned res = 0; + int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; + if (0 <= yylocp->first_line) + { + res += fprintf (yyo, "%d", yylocp->first_line); + if (0 <= yylocp->first_column) + res += fprintf (yyo, ".%d", yylocp->first_column); + } + if (0 <= yylocp->last_line) + { + if (yylocp->first_line < yylocp->last_line) + { + res += fprintf (yyo, "-%d", yylocp->last_line); + if (0 <= end_col) + res += fprintf (yyo, ".%d", end_col); + } + else if (0 <= end_col && yylocp->first_column < end_col) + res += fprintf (yyo, "-%d", end_col); + } + return res; + } + +# define YY_LOCATION_PRINT(File, Loc) \ + yy_location_print_ (File, &(Loc)) + # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif @@ -923,7 +986,6 @@ while (YYID (0)) /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) #else @@ -975,6 +1037,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, context) ConfigCompiler *context; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; YYUSE (yylocationp); @@ -985,11 +1049,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, context) # else YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -1234,12 +1294,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULL; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1299,11 +1358,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -1323,10 +1384,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1386,29 +1449,10 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, context) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YYUSE (yytype); } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (ConfigCompiler *context); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /*----------. @@ -1440,11 +1484,40 @@ yyparse (context) /* The lookahead symbol. */ int yychar; + +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") +#else +/* Default value used for initialization, for pacifying older GCCs + or non-GCC compilers. */ +static YYSTYPE yyval_default; +# define YY_INITIAL_VALUE(Value) = Value +#endif +static YYLTYPE yyloc_default +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + = { 1, 1, 1, 1 } +# endif +; +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Location data for the lookahead symbol. */ -YYLTYPE yylloc; +YYLTYPE yylloc = yyloc_default; + /* Number of syntax errors so far. */ int yynerrs; @@ -1458,7 +1531,7 @@ YYLTYPE yylloc; `yyvs': related to semantic values. `yyls': related to locations. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -1484,7 +1557,7 @@ YYLTYPE yylloc; int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -1503,10 +1576,9 @@ YYLTYPE yylloc; Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; - yyls = yylsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; + yylsp = yyls = yylsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -1515,21 +1587,7 @@ YYLTYPE yylloc; yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - yylsp = yyls; - -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - /* Initialize the default location before parsing starts. */ - yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 1; -#endif - + yylsp[0] = yylloc; goto yysetstate; /*------------------------------------------------------------. @@ -1675,7 +1733,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END *++yylsp = yylloc; goto yynewstate; @@ -1713,8 +1773,7 @@ yyreduce: switch (yyn) { case 9: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 160 "config_parser.yy" { context->HandleInclude(*(yyvsp[(2) - (2)].variant), false, yylloc); @@ -1723,8 +1782,7 @@ yyreduce: break; case 10: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 165 "config_parser.yy" { context->HandleInclude((yyvsp[(2) - (2)].text), true, yylloc); @@ -1733,8 +1791,7 @@ yyreduce: break; case 11: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 171 "config_parser.yy" { context->HandleLibrary((yyvsp[(2) - (2)].text)); @@ -1743,8 +1800,7 @@ yyreduce: break; case 12: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 177 "config_parser.yy" { Value *value = (yyvsp[(4) - (4)].variant); @@ -1763,8 +1819,7 @@ yyreduce: break; case 14: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 194 "config_parser.yy" { (yyval.text) = (yyvsp[(1) - (1)].text); @@ -1772,8 +1827,7 @@ yyreduce: break; case 15: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 200 "config_parser.yy" { String name = String((yyvsp[(3) - (3)].text)); @@ -1792,8 +1846,7 @@ yyreduce: break; case 16: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 215 "config_parser.yy" { TypeRuleList::Ptr ruleList = *(yyvsp[(6) - (6)].variant); @@ -1809,8 +1862,7 @@ yyreduce: break; case 17: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 229 "config_parser.yy" { (yyval.num) = 0; @@ -1818,8 +1870,7 @@ yyreduce: break; case 18: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 233 "config_parser.yy" { (yyval.num) = 1; @@ -1827,8 +1878,7 @@ yyreduce: break; case 19: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 239 "config_parser.yy" { m_RuleLists.push(boost::make_shared()); @@ -1836,8 +1886,7 @@ yyreduce: break; case 20: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 244 "config_parser.yy" { (yyval.variant) = new Value(m_RuleLists.top()); @@ -1846,8 +1895,7 @@ yyreduce: break; case 26: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 259 "config_parser.yy" { m_RuleLists.top()->AddRequire((yyvsp[(2) - (2)].text)); @@ -1856,8 +1904,7 @@ yyreduce: break; case 27: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 264 "config_parser.yy" { m_RuleLists.top()->SetValidator((yyvsp[(2) - (2)].text)); @@ -1866,8 +1913,7 @@ yyreduce: break; case 28: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 269 "config_parser.yy" { TypeRule rule((yyvsp[(2) - (3)].type), String(), (yyvsp[(3) - (3)].text), TypeRuleList::Ptr(), yylloc); @@ -1878,8 +1924,7 @@ yyreduce: break; case 29: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 276 "config_parser.yy" { TypeRule rule((yyvsp[(2) - (6)].type), (yyvsp[(4) - (6)].text), (yyvsp[(6) - (6)].text), TypeRuleList::Ptr(), yylloc); @@ -1891,8 +1936,7 @@ yyreduce: break; case 30: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 284 "config_parser.yy" { TypeRule rule((yyvsp[(2) - (4)].type), String(), (yyvsp[(3) - (4)].text), *(yyvsp[(4) - (4)].variant), yylloc); @@ -1903,8 +1947,7 @@ yyreduce: break; case 32: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 294 "config_parser.yy" { m_Type->SetParent((yyvsp[(2) - (2)].text)); @@ -1913,8 +1956,7 @@ yyreduce: break; case 39: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 307 "config_parser.yy" { (yyval.type) = (yyvsp[(1) - (1)].type); @@ -1922,8 +1964,7 @@ yyreduce: break; case 40: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 313 "config_parser.yy" { m_Abstract = false; @@ -1931,8 +1972,7 @@ yyreduce: break; case 41: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 317 "config_parser.yy" { ConfigItemBuilder::Ptr item = boost::make_shared(yylloc); @@ -1972,8 +2012,7 @@ yyreduce: break; case 43: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 356 "config_parser.yy" { m_Abstract = true; @@ -1981,8 +2020,7 @@ yyreduce: break; case 46: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 365 "config_parser.yy" { m_Abstract = true; @@ -1990,8 +2028,7 @@ yyreduce: break; case 47: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 371 "config_parser.yy" { (yyval.slist) = NULL; @@ -1999,8 +2036,7 @@ yyreduce: break; case 48: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 375 "config_parser.yy" { (yyval.slist) = new std::vector(); @@ -2010,8 +2046,7 @@ yyreduce: break; case 49: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 381 "config_parser.yy" { if ((yyvsp[(1) - (3)].slist)) @@ -2025,8 +2060,7 @@ yyreduce: break; case 50: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 393 "config_parser.yy" { (yyval.slist) = NULL; @@ -2034,8 +2068,7 @@ yyreduce: break; case 51: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 397 "config_parser.yy" { (yyval.slist) = (yyvsp[(2) - (2)].slist); @@ -2043,8 +2076,7 @@ yyreduce: break; case 52: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 403 "config_parser.yy" { if ((yyvsp[(2) - (3)].exprl)) @@ -2055,8 +2087,7 @@ yyreduce: break; case 53: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 412 "config_parser.yy" { (yyval.exprl) = (yyvsp[(1) - (1)].exprl); @@ -2064,8 +2095,7 @@ yyreduce: break; case 54: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 416 "config_parser.yy" { (yyval.exprl) = (yyvsp[(1) - (2)].exprl); @@ -2073,8 +2103,7 @@ yyreduce: break; case 55: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 421 "config_parser.yy" { (yyval.exprl) = NULL; @@ -2082,8 +2111,7 @@ yyreduce: break; case 56: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 425 "config_parser.yy" { (yyval.exprl) = new ExpressionList(); @@ -2093,8 +2121,7 @@ yyreduce: break; case 57: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 431 "config_parser.yy" { if ((yyvsp[(1) - (3)].exprl)) @@ -2108,8 +2135,7 @@ yyreduce: break; case 58: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 443 "config_parser.yy" { (yyval.expr) = new Expression((yyvsp[(1) - (3)].text), (yyvsp[(2) - (3)].op), *(yyvsp[(3) - (3)].variant), yylloc); @@ -2119,8 +2145,7 @@ yyreduce: break; case 59: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 449 "config_parser.yy" { Expression subexpr((yyvsp[(3) - (6)].text), (yyvsp[(5) - (6)].op), *(yyvsp[(6) - (6)].variant), yylloc); @@ -2136,8 +2161,7 @@ yyreduce: break; case 64: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 467 "config_parser.yy" { (yyval.op) = (yyvsp[(1) - (1)].op); @@ -2145,8 +2169,7 @@ yyreduce: break; case 65: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 473 "config_parser.yy" { (yyval.array) = (yyvsp[(2) - (3)].array); @@ -2154,8 +2177,7 @@ yyreduce: break; case 66: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 479 "config_parser.yy" { (yyval.array) = (yyvsp[(1) - (1)].array); @@ -2163,8 +2185,7 @@ yyreduce: break; case 67: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 483 "config_parser.yy" { (yyval.array) = (yyvsp[(1) - (2)].array); @@ -2172,8 +2193,7 @@ yyreduce: break; case 68: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 488 "config_parser.yy" { (yyval.array) = NULL; @@ -2181,8 +2201,7 @@ yyreduce: break; case 69: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 492 "config_parser.yy" { (yyval.array) = new Array(); @@ -2201,8 +2220,7 @@ yyreduce: break; case 70: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 507 "config_parser.yy" { if ((yyvsp[(1) - (3)].array)) @@ -2224,8 +2242,7 @@ yyreduce: break; case 71: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 527 "config_parser.yy" { (yyval.variant) = new Value((yyvsp[(1) - (1)].text)); @@ -2234,8 +2251,7 @@ yyreduce: break; case 72: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 532 "config_parser.yy" { (yyval.variant) = new Value((yyvsp[(1) - (1)].num)); @@ -2243,8 +2259,7 @@ yyreduce: break; case 73: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 536 "config_parser.yy" { (yyval.variant) = new Value(); @@ -2252,8 +2267,7 @@ yyreduce: break; case 74: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 540 "config_parser.yy" { if ((yyvsp[(1) - (1)].array) == NULL) @@ -2265,8 +2279,7 @@ yyreduce: break; case 75: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 550 "config_parser.yy" { (yyval.variant) = (yyvsp[(2) - (3)].variant); @@ -2274,8 +2287,7 @@ yyreduce: break; case 76: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 555 "config_parser.yy" { (yyval.variant) = new Value((yyvsp[(1) - (1)].text)); @@ -2284,8 +2296,7 @@ yyreduce: break; case 77: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 560 "config_parser.yy" { (yyval.variant) = new Value((yyvsp[(1) - (1)].num)); @@ -2293,8 +2304,7 @@ yyreduce: break; case 78: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 564 "config_parser.yy" { (yyval.variant) = new Value(ScriptVariable::Get((yyvsp[(1) - (1)].text))); @@ -2303,93 +2313,107 @@ yyreduce: break; case 79: - -/* Line 1806 of yacc.c */ +/* Line 1787 of yacc.c */ #line 569 "config_parser.yy" { if ((yyvsp[(1) - (3)].variant)->GetType() == ValueString || (yyvsp[(3) - (3)].variant)->GetType() == ValueString) (yyval.variant) = new Value((String)*(yyvsp[(1) - (3)].variant) + (String)*(yyvsp[(3) - (3)].variant)); else (yyval.variant) = new Value((double)*(yyvsp[(1) - (3)].variant) + (double)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 80: - -/* Line 1806 of yacc.c */ -#line 576 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 579 "config_parser.yy" { (yyval.variant) = new Value((double)*(yyvsp[(1) - (3)].variant) - (double)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 81: - -/* Line 1806 of yacc.c */ -#line 580 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 586 "config_parser.yy" { (yyval.variant) = new Value((double)*(yyvsp[(1) - (3)].variant) * (double)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 82: - -/* Line 1806 of yacc.c */ -#line 584 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 593 "config_parser.yy" { (yyval.variant) = new Value((double)*(yyvsp[(1) - (3)].variant) / (double)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 83: - -/* Line 1806 of yacc.c */ -#line 588 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 600 "config_parser.yy" { (yyval.variant) = new Value((long)*(yyvsp[(1) - (3)].variant) & (long)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 84: - -/* Line 1806 of yacc.c */ -#line 592 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 607 "config_parser.yy" { (yyval.variant) = new Value((long)*(yyvsp[(1) - (3)].variant) | (long)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 85: - -/* Line 1806 of yacc.c */ -#line 596 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 614 "config_parser.yy" { (yyval.variant) = new Value((long)*(yyvsp[(1) - (3)].variant) << (long)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 86: - -/* Line 1806 of yacc.c */ -#line 600 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 621 "config_parser.yy" { (yyval.variant) = new Value((long)*(yyvsp[(1) - (3)].variant) >> (long)*(yyvsp[(3) - (3)].variant)); + + delete (yyvsp[(1) - (3)].variant); + delete (yyvsp[(3) - (3)].variant); } break; case 87: - -/* Line 1806 of yacc.c */ -#line 604 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 628 "config_parser.yy" { (yyval.variant) = (yyvsp[(2) - (3)].variant); } break; case 89: - -/* Line 1806 of yacc.c */ -#line 611 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 635 "config_parser.yy" { ExpressionList::Ptr exprl = ExpressionList::Ptr((yyvsp[(1) - (1)].exprl)); (yyval.variant) = new Value(exprl); @@ -2397,18 +2421,16 @@ yyreduce: break; case 90: - -/* Line 1806 of yacc.c */ -#line 616 "config_parser.yy" +/* Line 1787 of yacc.c */ +#line 640 "config_parser.yy" { (yyval.variant) = (yyvsp[(1) - (1)].variant); } break; - -/* Line 1806 of yacc.c */ -#line 2412 "../../../lib/config/config_parser.cc" +/* Line 1787 of yacc.c */ +#line 2434 "config_parser.cc" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2573,7 +2595,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END yyerror_range[2] = yylloc; /* Using YYLLOC is tempting, but would change the location of @@ -2602,7 +2626,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -2644,8 +2668,6 @@ yyreturn: } - -/* Line 2067 of yacc.c */ -#line 620 "config_parser.yy" - +/* Line 2050 of yacc.c */ +#line 644 "config_parser.yy" diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy index 5e4b974f0..55722013f 100644 --- a/lib/config/config_parser.yy +++ b/lib/config/config_parser.yy @@ -571,34 +571,58 @@ constexpression: T_STRING $$ = new Value((String)*$1 + (String)*$3); else $$ = new Value((double)*$1 + (double)*$3); + + delete $1; + delete $3; } | constexpression '-' constexpression { $$ = new Value((double)*$1 - (double)*$3); + + delete $1; + delete $3; } | constexpression '*' constexpression { $$ = new Value((double)*$1 * (double)*$3); + + delete $1; + delete $3; } | constexpression '/' constexpression { $$ = new Value((double)*$1 / (double)*$3); + + delete $1; + delete $3; } | constexpression '&' constexpression { $$ = new Value((long)*$1 & (long)*$3); + + delete $1; + delete $3; } | constexpression '|' constexpression { $$ = new Value((long)*$1 | (long)*$3); + + delete $1; + delete $3; } | constexpression T_SHIFT_LEFT constexpression { $$ = new Value((long)*$1 << (long)*$3); + + delete $1; + delete $3; } | constexpression T_SHIFT_RIGHT constexpression { $$ = new Value((long)*$1 >> (long)*$3); + + delete $1; + delete $3; } | '(' constexpression ')' {