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

fix daca chromium crash (#2527)

This commit is contained in:
IOBYTE 2020-02-09 05:19:36 -05:00 committed by GitHub
parent b1c6f2946a
commit 4d58d9fc87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/templatesimplifier.cpp
View File

@ -1238,8 +1238,11 @@ void TemplateSimplifier::simplifyTemplateAliases()
while (tok2 && !Token::Match(tok2, "[,>;{}]")) {
if (tok2->link() && Token::Match(tok2, "(|["))
tok2 = tok2->link();
else if (tok2->str() == "<")
else if (tok2->str() == "<") {
tok2 = tok2->findClosingBracket();
if (!tok2)
break;
}
tok2 = tok2->next();
}

15
test/testsimplifytemplate.cpp
View File

@ -193,6 +193,7 @@ private:
TEST_CASE(template153); // #9483
TEST_CASE(template154); // #9495
TEST_CASE(template155); // #9539
TEST_CASE(template156);
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_enum); // #6299 Syntax error in complex enum declaration (including template)
@ -3712,6 +3713,20 @@ private:
ASSERT_EQUALS(exp, tok(code));
}
void template156() {
const char code[] = "template <int a> struct c { static constexpr int d = a; };\n"
"template <bool b> using e = c<b>;\n"
"using f = e<false>;\n"
"template <typename> struct g : f {};\n"
"template <bool, class, class> using h = e<g<long>::d>;\n"
"template <typename> using i = e<g<double>::d>;\n"
"template <typename j> using k = e<i<j>::d>;\n"
"template <typename j> using l = h<k<j>::d, e<1 < (j)0>, f>;\n"
"template <typename> void m(int, int, int) { l<int> d; }\n"
"void n() { m<int>(0, 4, 5); }";
tok(code); // don't crash
}
void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..};
const char code[] = "template <typename T> struct C {};\n"
"template <typename T> struct S {a};\n"