Fixed cppcheck-opensource#4767 (segmentation fault in expand template)

zingsheim · zingsheim · commit 42068a3d60df · 2013-05-01T13:28:01.000+02:00
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -630,7 +630,7 @@ void TemplateSimplifier::expandTemplate(
     std::list<Token *> &templateInstantiations)
 {
     for (const Token *tok3 = tokenlist.front(); tok3; tok3 = tok3->next()) {
-        if (tok3->str() == "{" || tok3->str() == "(")
+        if (tok3->str() == "{" || tok3->str() == "(" || tok3->str() == "[")
             tok3 = tok3->link();
 
         // Start of template..
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -1894,6 +1894,7 @@ class TestSimplifyTokens : public TestFixture {
                             "{\n"
                             "public:\n"
                             "    static AA<T> create(T* newObject);\n"
+                            "    static int size();\n"
                             "};\n"
                             "\n"
                             "class CC { public: CC(AA<BB>, int) {} };\n"
@@ -1906,7 +1907,9 @@ class TestSimplifyTokens : public TestFixture {
                             "\n"
                             "XX::XX():\n"
                             "    y(AA<CC>::create(new CC(AA<BB>(), 0)))\n"
-                            "    {}\n";
+                            "    {}\n"
+                            "\n"
+                            "int yy[AA<CC>::size()];";
 
         // Just run it and check that there are not assertions.
         tok(code);

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ void TemplateSimplifier::expandTemplate(`
`630`	`630`	`std::list<Token *> &templateInstantiations)`
`631`	`631`	`{`
`632`	`632`	`for (const Token *tok3 = tokenlist.front(); tok3; tok3 = tok3->next()) {`
`633`		`- if (tok3->str() == "{" \|\| tok3->str() == "(")`
	`633`	`+ if (tok3->str() == "{" \|\| tok3->str() == "(" \|\| tok3->str() == "[")`
`634`	`634`	`tok3 = tok3->link();`
`635`	`635`
`636`	`636`	`// Start of template..`