Fix cppcheck-opensource#2847, cppcheck hangs with 100% cpu load

aggro80 · aggro80 · commit 5a72bed06456 · 2011-06-22T14:09:42.000+03:00
http://sourceforge.net/apps/trac/cppcheck/ticket/2847
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
@@ -55,7 +55,7 @@ void CheckPostfixOperator::postfixOperator()
             else if (tok->strAt(-2) == ",")
             {
                 int i(1);
-                while (tok->strAt(i) != ")")
+                while (tok->strAt(i) != ")" && tok->tokAt(i) != 0)
                 {
                     if (tok->strAt(i) == ";")
                     {
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
@@ -70,6 +70,13 @@ class TestPostfixOperator : public TestFixture
         TEST_CASE(testiterator);
         TEST_CASE(test2168);
         TEST_CASE(pointer);   // #2321 - postincrement of pointer is OK
+        TEST_CASE(testHangWithInvalidCode); // #2847 - cppcheck hangs with 100% cpu load
+    }
+
+    void testHangWithInvalidCode()
+    {
+        check("a,b--\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void testsimple()

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void CheckPostfixOperator::postfixOperator()`
`55`	`55`	`else if (tok->strAt(-2) == ",")`
`56`	`56`	`{`
`57`	`57`	`int i(1);`
`58`		`- while (tok->strAt(i) != ")")`
	`58`	`+ while (tok->strAt(i) != ")" && tok->tokAt(i) != 0)`
`59`	`59`	`{`
`60`	`60`	`if (tok->strAt(i) == ";")`
`61`	`61`	`{`