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

Fix crash in issue 9007 (#1878)

This commit is contained in:
Paul Fultz II 2019-06-10 01:24:09 -05:00 committed by Daniel Marjamäki
parent 169510bd3a
commit b863c18e1d
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/templatesimplifier.cpp
View File

@ -2955,6 +2955,9 @@ void TemplateSimplifier::replaceTemplateUsage(
} }
} }
} }
// Fix crash in #9007
if (Token::simpleMatch(nameTok->previous(), ">"))
mTemplateNamePos.erase(nameTok->previous());
removeTokens.emplace_back(nameTok, tok2->next()); removeTokens.emplace_back(nameTok, tok2->next());
} }

18
test/testtokenize.cpp
View File

@ -461,6 +461,7 @@ private:
// #9052 // #9052
TEST_CASE(noCrash1); TEST_CASE(noCrash1);
TEST_CASE(noCrash2);
// --check-config // --check-config
TEST_CASE(checkConfiguration); TEST_CASE(checkConfiguration);
@ -7813,6 +7814,23 @@ private:
"A::A( const std::string &name ) { return; }\n")) "A::A( const std::string &name ) { return; }\n"))
} }
// #9007
void noCrash2() {
ASSERT_NO_THROW(tokenizeAndStringify(
"class a {\n"
"public:\n"
" enum b {};\n"
"};\n"
"struct c;\n"
"template <class> class d {\n"
" d(const int &, a::b, double, double);\n"
" d(const d &);\n"
"};\n"
"template <> d<int>::d(const int &, a::b, double, double);\n"
"template <> d<int>::d(const d &) {}\n"
"template <> d<c>::d(const d &) {}\n"))
}
void checkConfig(const char code[]) { void checkConfig(const char code[]) {
errout.str(""); errout.str("");