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

glr2.cc: fix memory corruption bug

Browse Source 
* data/skeletons/glr2.cc (yyremoveDeletes): Remove double-increment in
the loop.
(glr_state::copyFrom): Handle gracefully when other is resolved.
This commit is contained in:
Valentin Tolmer
2020-11-11 18:55:15 +01:00
committed by Akim Demaille
parent e72eda7aee
commit 2ec6df3b07
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
data/skeletons/glr2.cc
View File

@@ -799,7 +799,11 @@ public:
void copyFrom(const glr_state& other) { void copyFrom(const glr_state& other) {
*this = other; *this = other;
setPred(other.pred()); setPred(other.pred());
setFirstVal(other.firstVal()); if (other.yyresolved) {
semanticVal() = other.semanticVal();
} else {
setFirstVal(other.firstVal());
}
} }
/** Type tag for If true, yysval applies, otherwise /** Type tag for If true, yysval applies, otherwise
@@ -945,9 +949,9 @@ class glr_state_set {
inline void inline void
yyremoveDeletes () yyremoveDeletes ()
{ {
std::ptrdiff_t newsize = static_cast<std::ptrdiff_t>(yystates.size()); size_t newsize = yystates.size();
/* j is the number of live stacks we have seen. */ /* j is the number of live stacks we have seen. */
for (size_t i = 0, j = 0; i < yystates.size(); ++i) for (size_t i = 0, j = 0; j < newsize; ++i)
{ {
if (yystates[i] == YY_NULLPTR) if (yystates[i] == YY_NULLPTR)
{ {
@@ -972,10 +976,9 @@ class glr_state_set {
} }
j += 1; j += 1;
} }
i += 1;
} }
yystates.erase(yystates.begin() + newsize, yystates.end()); yystates.erase(yystates.begin() + static_cast<std::ptrdiff_t>(newsize), yystates.end());
yylookaheadNeeds.erase(yylookaheadNeeds.begin() + newsize, yylookaheadNeeds.erase(yylookaheadNeeds.begin() + static_cast<std::ptrdiff_t>(newsize),
yylookaheadNeeds.end()); yylookaheadNeeds.end());
} }