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

Fix #11146 Crash in expandTemplate() (#4238)

This commit is contained in:
chrchr-github 2022-06-28 22:43:34 +02:00 committed by GitHub
parent a2f2699088
commit f8b796403b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/templatesimplifier.cpp
View File

@ -3791,8 +3791,10 @@ void TemplateSimplifier::simplifyTemplates(
specializations, specializations,
maxtime, maxtime,
expandedtemplates); expandedtemplates);
if (instantiated) if (instantiated) {
mInstantiatedTemplates.push_back(*iter1); mInstantiatedTemplates.push_back(*iter1);
mTemplateNamePos.clear(); // positions might be invalid after instantiations
}
} }
for (std::list<TokenAndName>::const_iterator it = mInstantiatedTemplates.begin(); it != mInstantiatedTemplates.end(); ++it) { for (std::list<TokenAndName>::const_iterator it = mInstantiatedTemplates.begin(); it != mInstantiatedTemplates.end(); ++it) {

24
test/testsimplifytemplate.cpp
View File

@ -218,6 +218,7 @@ private:
TEST_CASE(template173); // #10332 crash TEST_CASE(template173); // #10332 crash
TEST_CASE(template174); // #10506 hang TEST_CASE(template174); // #10506 hang
TEST_CASE(template175); // #10908 TEST_CASE(template175); // #10908
TEST_CASE(template176); // #11146
TEST_CASE(template_specialization_1); // #7868 - template specialization template <typename T> struct S<C<T>> {..}; TEST_CASE(template_specialization_1); // #7868 - template specialization template <typename T> struct S<C<T>> {..};
TEST_CASE(template_specialization_2); // #7868 - template specialization template <typename T> struct S<C<T>> {..}; TEST_CASE(template_specialization_2); // #7868 - template specialization template <typename T> struct S<C<T>> {..};
TEST_CASE(template_enum); // #6299 Syntax error in complex enum declaration (including template) TEST_CASE(template_enum); // #6299 Syntax error in complex enum declaration (including template)
@ -4458,7 +4459,7 @@ private:
ASSERT_EQUALS(exp, tok(code)); ASSERT_EQUALS(exp, tok(code));
} }
void template175() void template175() // #10908
{ {
const char code[] = "template <typename T, int value> T Get() {return value;}\n" const char code[] = "template <typename T, int value> T Get() {return value;}\n"
"char f() { Get<int,10>(); }\n"; "char f() { Get<int,10>(); }\n";
@ -4468,6 +4469,27 @@ private:
ASSERT_EQUALS(exp, tok(code)); ASSERT_EQUALS(exp, tok(code));
} }
void template176() // #11146 don't crash
{
const char code[] = "struct a {\n"
" template <typename> class b {};\n"
"};\n"
"struct c {\n"
" template <typename> a::b<int> d();\n"
" ;\n"
"};\n"
"template <typename> a::b<int> c::d() {}\n"
"template <> class a::b<int> c::d<int>() { return {}; };\n";
const char exp[] = "struct a { "
"class b<int> c :: d<int> ( ) ; "
"template < typename > class b { } ; "
"} ; "
"struct c { a :: b<int> d<int> ( ) ; } ; "
"class a :: b<int> c :: d<int> ( ) { return { } ; } ; "
"a :: b<int> c :: d<int> ( ) { }";
ASSERT_EQUALS(exp, tok(code));
}
void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..}; void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..};
const char code[] = "template <typename T> struct C {};\n" const char code[] = "template <typename T> struct C {};\n"
"template <typename T> struct S {a};\n" "template <typename T> struct S {a};\n"