baswi
diff --git a/‎lib/tokenize.cpp‎
Lines changed: 8 additions & 0 deletions b/‎lib/tokenize.cpp‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/testbufferoverrun.cpp‎
Lines changed: 0 additions & 6 deletions b/‎test/testbufferoverrun.cpp‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎test/testconstructors.cpp‎
Lines changed: 6 additions & 9 deletions b/‎test/testconstructors.cpp‎
Lines changed: 6 additions & 9 deletions
@@ -8027,6 +8027,14 @@ const Token * Tokenizer::findGarbageCode() const
             }
         }
     }
+
+    // Code must end with } ; ) NAME
+    if (!Token::Match(list.back(), "%name%|;|}|)"))
+        return list.back();
+    if (list.back()->str() == ")" && !Token::Match(list.back()->link()->previous(), "%name% ("))
+        return list.back();
+
+
     return nullptr;
 }
 
 
@@ -158,7 +158,6 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(buffer_overrun_16);
         TEST_CASE(buffer_overrun_18); // ticket #2576 - for, calculation with loop variable
         TEST_CASE(buffer_overrun_19); // #2597 - class member with unknown type
-        TEST_CASE(buffer_overrun_20); // #2986 (segmentation fault)
         TEST_CASE(buffer_overrun_21);
         TEST_CASE(buffer_overrun_24); // index variable is changed in for-loop
         TEST_CASE(buffer_overrun_26); // #4432 (segmentation fault)
@@ -2413,11 +2412,6 @@ class TestBufferOverrun : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
-    void buffer_overrun_20() { // #2986(segmentation fault)
-        check("x[y]\n");
-        ASSERT_EQUALS("", errout.str());
-    }
-
     void buffer_overrun_21() {
         check("void foo()\n"
               "{ { {\n"
 
@@ -2905,41 +2905,38 @@ class TestConstructors : public TestFixture {
 
 
     void uninitVarHeader1() {
-        check("#file \"fred.h\"\n"
+        check("#line 1 \"fred.h\"\n"
               "class Fred\n"
               "{\n"
               "private:\n"
               "    unsigned int i;\n"
               "public:\n"
               "    Fred();\n"
-              "};\n"
-              "#endfile");
+              "};\n");
         ASSERT_EQUALS("", errout.str());
     }
 
     void uninitVarHeader2() {
-        check("#file \"fred.h\"\n"
+        check("#line 1 \"fred.h\"\n"
               "class Fred\n"
               "{\n"
               "private:\n"
               "    unsigned int i;\n"
               "public:\n"
               "    Fred() { }\n"
-              "};\n"
-              "#endfile");
+              "};\n");
         ASSERT_EQUALS("[fred.h:6]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
     }
 
     void uninitVarHeader3() {
-        check("#file \"fred.h\"\n"
+        check("#line 1 \"fred.h\"\n"
               "class Fred\n"
               "{\n"
               "private:\n"
               "    mutable int i;\n"
               "public:\n"
               "    Fred() { }\n"
-              "};\n"
-              "#endfile");
+              "};\n");
         ASSERT_EQUALS("[fred.h:6]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
     }
Original file line number	Diff line number	Diff line change
`@@ -8027,6 +8027,14 @@ const Token * Tokenizer::findGarbageCode() const`
`8027`	`8027`	`}`
`8028`	`8028`	`}`
`8029`	`8029`	`}`
	`8030`	`+`
	`8031`	`+ // Code must end with } ; ) NAME`
	`8032`	`+ if (!Token::Match(list.back(), "%name%\|;\|}\|)"))`
	`8033`	`+ return list.back();`
	`8034`	`+ if (list.back()->str() == ")" && !Token::Match(list.back()->link()->previous(), "%name% ("))`
	`8035`	`+ return list.back();`
	`8036`	`+`
	`8037`	`+`
`8030`	`8038`	`return nullptr;`
`8031`	`8039`	`}`
`8032`	`8040`