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

glr2.cc: fix yycompressStack

Browse Source 
Currently, yycompressStack expects the free items to be states only.
That's not the case.

Fixes 712 and 730 pass.  748 still fails, but later and
differently (heap-use-after-free).

* data/skeletons/glr2.cc (glr_stack_item::setState): New.
(glr_stack_item::yycompressStack): Use it.
* tests/glr-regression.at: Adjust.
This commit is contained in:
Akim Demaille
2020-12-12 17:32:01 +01:00
parent 5b65b3d543
commit c8006f4637
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/skeletons/glr2.cc
View File

@@ -800,7 +800,7 @@ public:
, magic_ (MAGIC)]])[ , magic_ (MAGIC)]])[
{} {}
void copyFrom(const glr_state& other) void copyFrom (const glr_state& other)
{]b4_parse_assert_if([[ {]b4_parse_assert_if([[
other.check_ ();]])[ other.check_ ();]])[
*this = other; *this = other;
@@ -1225,6 +1225,18 @@ public:
getOption().~semantic_option(); getOption().~semantic_option();
} }
void setState (const glr_state &state)
{]b4_parse_assert_if([[
check_ ();]])[
// FIXME: What about the previous content? Shouldn't it be freed?
// It might be useful to have an explicit "void" state when this item
// is in unused state (in the list of free items), when parse.assert
// is set.
is_state_ = true;
void *yyp = raw_;
static_cast<glr_state*> (yyp)->copyFrom (state);
}
glr_state& getState () glr_state& getState ()
{]b4_parse_assert_if([[ {]b4_parse_assert_if([[
check_ ();]])[ check_ ();]])[
@@ -1232,6 +1244,7 @@ public:
void *yyp = raw_; void *yyp = raw_;
return *static_cast<glr_state*> (yyp); return *static_cast<glr_state*> (yyp);
} }
const glr_state& getState () const const glr_state& getState () const
{]b4_parse_assert_if([[ {]b4_parse_assert_if([[
check_ ();]])[ check_ ();]])[
@@ -1496,8 +1509,8 @@ class state_stack {
while (yyr != YY_NULLPTR) while (yyr != YY_NULLPTR)
{ {
nextFreeItem->setState(*yyr);
glr_state& nextFreeState = nextFreeItem->getState(); glr_state& nextFreeState = nextFreeItem->getState();
nextFreeState.copyFrom(*yyr);
yyr = yyr->pred(); yyr = yyr->pred();
nextFreeState.setPred(&(nextFreeItem - 1)->getState()); nextFreeState.setPred(&(nextFreeItem - 1)->getState());
setFirstTop(&nextFreeState); setFirstTop(&nextFreeState);

2
tests/glr-regression.at
View File

@@ -142,7 +142,6 @@ m4_pushdef([AT_TEST],
[AT_SETUP([Improper handling of embedded actions and dollar(-N) in GLR parsers: $1]) [AT_SETUP([Improper handling of embedded actions and dollar(-N) in GLR parsers: $1])
AT_BISON_OPTION_PUSHDEFS([%glr-parser $1]) AT_BISON_OPTION_PUSHDEFS([%glr-parser $1])
AT_GLR2_CC_IF([AT_XFAIL_IF([true])])
AT_DATA_GRAMMAR([glr-regr2a.y], AT_DATA_GRAMMAR([glr-regr2a.y],
[[/* Regression Test: Improper handling of embedded actions and $-N */ [[/* Regression Test: Improper handling of embedded actions and $-N */
@@ -744,7 +743,6 @@ m4_pushdef([AT_TEST],
[AT_SETUP([Incorrectly initialized location for empty right-hand side in GLR: $1]) [AT_SETUP([Incorrectly initialized location for empty right-hand side in GLR: $1])
AT_BISON_OPTION_PUSHDEFS([%glr-parser %locations $1]) AT_BISON_OPTION_PUSHDEFS([%glr-parser %locations $1])
AT_GLR2_CC_IF([AT_XFAIL_IF([true])])
AT_DATA_GRAMMAR([glr-regr8.y], AT_DATA_GRAMMAR([glr-regr8.y],
[[ [[