walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix template simplifier from deleting the same declaration multiple times (#1449) 

Found by running valgrind on testrunner. May fix #8808.
This commit is contained in:
IOBYTE 2018-10-24 13:32:37 -04:00 committed by Daniel Marjamäki
parent 0763fdbfad
commit ea4e6a60f7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/templatesimplifier.cpp
View File

@ -398,9 +398,9 @@ bool TemplateSimplifier::removeTemplate(Token *tok)
else if (tok2->str() == "{") { else if (tok2->str() == "{") {
tok2 = tok2->link()->next(); tok2 = tok2->link()->next();
eraseTokens(tok, tok2);
if (tok2 && tok2->str() == ";" && tok2->next()) if (tok2 && tok2->str() == ";" && tok2->next())
deleteToken(tok->next()); tok2 = tok2->next();
eraseTokens(tok, tok2);
deleteToken(tok); deleteToken(tok);
return true; return true;
} else if (tok2->str() == "}") { // garbage code! (#3449) } else if (tok2->str() == "}") { // garbage code! (#3449)
@ -2023,8 +2023,14 @@ void TemplateSimplifier::simplifyTemplates(
// remove out of line member functions // remove out of line member functions
while (!mMemberFunctionsToDelete.empty()) { while (!mMemberFunctionsToDelete.empty()) {
removeTemplate(mMemberFunctionsToDelete.begin()->token); const std::list<TokenAndName>::iterator it = std::find_if(mTemplateDeclarations.begin(),
mTemplateDeclarations.remove(mMemberFunctionsToDelete.front()); mTemplateDeclarations.end(),
FindToken(mMemberFunctionsToDelete.begin()->token));
// multiple functions can share the same declaration so make sure it hasn't already been deleted
if (it != mTemplateDeclarations.end()) {
removeTemplate(it->token);
mTemplateDeclarations.erase(it);
}
mMemberFunctionsToDelete.erase(mMemberFunctionsToDelete.begin()); mMemberFunctionsToDelete.erase(mMemberFunctionsToDelete.begin());
} }
} }