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

template simplifier: fix crash on windows (#1639) 

* template simplifier: fix crash on windows

Use right token when searching for template type alias to delete.

* template simplifier: fix a cppcheck warning
This commit is contained in:
IOBYTE 2019-02-01 00:59:49 -05:00 committed by Daniel Marjamäki
parent 8925299947
commit d08aa666f6
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/templatesimplifier.cpp
View File

@ -1036,9 +1036,9 @@ void TemplateSimplifier::simplifyTemplateAliases()
} }
// find declaration // find declaration
const std::list<TokenAndName>::iterator it2 = std::find_if(mTemplateDeclarations.begin(), const std::list<TokenAndName>::iterator it3 = std::find_if(mTemplateDeclarations.begin(),
mTemplateDeclarations.end(), mTemplateDeclarations.end(),
FindToken(startToken ? startToken : mTokenList.front())); FindToken(startToken ? startToken->next() : mTokenList.front()));
if (startToken) if (startToken)
eraseTokens(startToken, endToken); eraseTokens(startToken, endToken);
@ -1048,8 +1048,8 @@ void TemplateSimplifier::simplifyTemplateAliases()
} }
// remove declaration // remove declaration
if (it2 != mTemplateDeclarations.end()) if (it3 != mTemplateDeclarations.end())
mTemplateDeclarations.erase(it2); mTemplateDeclarations.erase(it3);
} }
} }
} }

15
test/testsimplifytemplate.cpp
View File

@ -1282,7 +1282,7 @@ private:
tok(code); // don't crash tok(code); // don't crash
} }
void template65() { // #8321 void template65() { // #8321 (crash)
const char code[] = "namespace bpp\n" const char code[] = "namespace bpp\n"
"{\n" "{\n"
"template<class N, class E, class DAGraphImpl>\n" "template<class N, class E, class DAGraphImpl>\n"
@ -1298,7 +1298,18 @@ private:
" AssociationDAGlobalGraphObserver<string,unsigned int> grObs;\n" " AssociationDAGlobalGraphObserver<string,unsigned int> grObs;\n"
" return 1;\n" " return 1;\n"
"}"; "}";
tok(code); // don't crash const char exp [] = "namespace bpp "
"{ "
"class AssociationDAGraphImplObserver<string,unsignedint,DAGlobalGraph> ; "
"} "
"using namespace bpp ; "
"int main ( ) { "
"bpp :: AssociationDAGraphImplObserver<string,unsignedint,DAGlobalGraph> grObs ; "
"return 1 ; "
"} class bpp :: AssociationDAGraphImplObserver<string,unsignedint,DAGlobalGraph> : "
"public AssociationGraphImplObserver < std :: string , int , DAGlobalGraph > "
"{ } ;";
ASSERT_EQUALS(exp, tok(code));
} }
void template66() { // #8725 void template66() { // #8725