Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 08:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* data/push.c (yypushparse): Fix memory leak if yymsg is malloced

Browse Source 
in a push parser.  Reindent slightly to match yacc.c better.

2006-10-11  Bob Rossi  <bob@brasko.net>

        * data/push.c (struct yypvars): Remove yymsgbuf, yymsgbuf_ptr, yymsg,
        yymsg_alloc fields.
        (yypvarsinit, yypushparse): Remove init of removed fields.
        (yypushparse): Use yymsgbuf instead of yymsgbuf_ptr.
This commit is contained in:
Paul Eggert
2006-10-11 16:35:34 +00:00
parent c1630a8b80
commit 96a1981a77
2 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2006-10-11 Paul Eggert <eggert@cs.ucla.edu>
* data/push.c (yypushparse): Fix memory leak if yymsg is malloced
in a push parser. Reindent slightly to match yacc.c better.
2006-10-11 Bob Rossi <bob@brasko.net>
* data/push.c (struct yypvars): Remove yymsgbuf, yymsgbuf_ptr, yymsg,
yymsg_alloc fields.
(yypvarsinit, yypushparse): Remove init of removed fields.
(yypushparse): Use yymsgbuf instead of yymsgbuf_ptr.
2006-10-09 Paul Eggert <eggert@cs.ucla.edu> 2006-10-09 Paul Eggert <eggert@cs.ucla.edu>
* THANKS: Add Paolo Bonzini and Bob Rossi. * THANKS: Add Paolo Bonzini and Bob Rossi.

48
data/push.c
View File

@@ -1017,14 +1017,6 @@ m4_define([b4_declare_yyparse_variables],
/* Look-ahead token as an internal (translated) token number. */ /* Look-ahead token as an internal (translated) token number. */
int yytoken; int yytoken;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
char yymsgbuf[128];
char *yymsgbuf_ptr;
char *yymsg;
YYSIZE_T yymsg_alloc;
#endif
/* Three stacks and their tools: /* Three stacks and their tools:
`yyss': related to states, `yyss': related to states,
`yyvs': related to semantic values, `yyvs': related to semantic values,
@@ -1070,12 +1062,6 @@ yypvarsinit (void)
pv->yyerrstatus = 0; pv->yyerrstatus = 0;
pv->yytoken = 0; pv->yytoken = 0;
#if YYERROR_VERBOSE
pv->yymsgbuf_ptr = pv->yymsgbuf;
pv->yymsg = pv->yymsgbuf;
pv->yymsg_alloc = sizeof pv->yymsgbuf;
#endif
pv->yyssa_ptr = pv->yyssa; pv->yyssa_ptr = pv->yyssa;
pv->yyss = pv->yyssa; pv->yyss = pv->yyssa;
pv->yyvs = pv->yyvsa; pv->yyvs = pv->yyvsa;
@@ -1153,7 +1139,6 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
#if YYERROR_VERBOSE #if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */ /* Buffer for error messages, and its allocated size. */
char yymsgbuf[128]; char yymsgbuf[128];
char *yymsgbuf_ptr = yymsgbuf;
char *yymsg = yymsgbuf; char *yymsg = yymsgbuf;
YYSIZE_T yymsg_alloc = sizeof yymsgbuf; YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
#endif #endif
@@ -1248,11 +1233,7 @@ m4_ifdef([b4_at_dollar_used], [[ yylsp[0] = yylloc;
yyresult = pv->yyresult; yyresult = pv->yyresult;
yyerrstatus = pv->yyerrstatus; yyerrstatus = pv->yyerrstatus;
yytoken = pv->yytoken; yytoken = pv->yytoken;
#if YYERROR_VERBOSE
yymsgbuf_ptr = pv->yymsgbuf_ptr;
yymsg = pv->yymsg;;
yymsg_alloc = pv->yymsg_alloc;
#endif
yyssa_ptr = pv->yyssa_ptr; yyssa_ptr = pv->yyssa_ptr;
yyss = pv->yyss; yyss = pv->yyss;
yyssp = pv->yyssp; yyssp = pv->yyssp;
@@ -1390,14 +1371,9 @@ yybackup:
pv->yystate = yystate; pv->yystate = yystate;
pv->yyn = yyn; pv->yyn = yyn;
pv->yyresult = yyresult;
pv->yyerrstatus = yyerrstatus; pv->yyerrstatus = yyerrstatus;
pv->yytoken = yytoken; pv->yytoken = yytoken;
#if YYERROR_VERBOSE
pv->yymsgbuf_ptr = yymsgbuf_ptr;
pv->yymsg = yymsg;;
pv->yymsg_alloc = yymsg_alloc;
#endif
pv->yyssa_ptr = yyssa_ptr; pv->yyssa_ptr = yyssa_ptr;
pv->yyss = yyss; pv->yyss = yyss;
pv->yyssp = yyssp; pv->yyssp = yyssp;
@@ -1414,11 +1390,10 @@ yybackup:
pv->yylen = yylen; pv->yylen = yylen;
pv->yyval = yyval; pv->yyval = yyval;
]b4_locations_if([pv->yyloc = yyloc;])[ ]b4_locations_if([pv->yyloc = yyloc;])[
return yyresult; goto yypushreturn;
gottoken: gottoken:])
YYDPRINTF((stderr, "Reading a token: "));],[ YYDPRINTF ((stderr, "Reading a token: "));
YYDPRINTF ((stderr, "Reading a token: ")); ]b4_push_if([], [yychar = YYLEX;])[
yychar = YYLEX;])[
} }
if (yychar <= YYEOF) if (yychar <= YYEOF)
@@ -1541,14 +1516,14 @@ yyerrlab:
YYSIZE_T yyalloc = 2 * yysize; YYSIZE_T yyalloc = 2 * yysize;
if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
yyalloc = YYSTACK_ALLOC_MAXIMUM; yyalloc = YYSTACK_ALLOC_MAXIMUM;
if (yymsg != yymsgbuf_ptr) if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg); YYSTACK_FREE (yymsg);
yymsg = (char *) YYSTACK_ALLOC (yyalloc); yymsg = (char *) YYSTACK_ALLOC (yyalloc);
if (yymsg) if (yymsg)
yymsg_alloc = yyalloc; yymsg_alloc = yyalloc;
else else
{ {
yymsg = yymsgbuf_ptr; yymsg = yymsgbuf;
yymsg_alloc = sizeof yymsgbuf; yymsg_alloc = sizeof yymsgbuf;
} }
} }
@@ -1704,13 +1679,14 @@ yyreturn:
if (yyss != yyssa_ptr) if (yyss != yyssa_ptr)
YYSTACK_FREE (yyss); YYSTACK_FREE (yyss);
#endif #endif
]b4_push_if([yypushreturn:])[
#if YYERROR_VERBOSE #if YYERROR_VERBOSE
if (yymsg != yymsgbuf_ptr) if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg); YYSTACK_FREE (yymsg);
#endif #endif
]b4_push_if([pv->yyresult = YYID (yyresult);])[ ]b4_push_if([pv->yyresult = YYID (yyresult);])[
/* Make sure YYID is used. */ /* Make sure YYID is used. */
return YYID (yyresult); return YYID (yyresult);
]} ]}
b4_push_if([ b4_push_if([