Fixed false positive in CheckUnusedVar::checkFunctionVariableUsage(): Bailout when break; is encountered

PKEuS · PKEuS · commit 3bdcf689908b · 2016-07-07T18:27:31.000+02:00
See also: https://sourceforge.net/p/cppcheck/discussion/general/thread/1c169dc5/
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -769,7 +769,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             variables.clear();
             break;
         }
-        if (Token::simpleMatch(tok, "goto")) { // https://sourceforge.net/apps/trac/cppcheck/ticket/4447
+        if (Token::Match(tok, "goto|break")) { // #4447
             variables.clear();
             break;
         }
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
@@ -3770,9 +3770,25 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    return ptr;\n"
                               "}");
-
-        // Don't write an error that "a" is not used
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout.str()); // Don't write an error that "a" is not used
+
+        functionVariableUsage("void x() {\n"
+                              "    unsigned char* pcOctet = NULL;\n"
+                              "    float fValeur;\n"
+                              "    switch (pnodeCurrent->left.pnode->usLen) {\n"
+                              "    case 4:\n"
+                              "        fValeur = (float)pevalDataLeft->data.fd;\n"
+                              "        pcOctet = (unsigned char*)&fValeur;\n"
+                              "        break;\n"
+                              "    case 8:\n"
+                              "        pcOctet = (unsigned char*)&pevalDataLeft->data.fd;\n"
+                              "        break;\n"
+                              "    }\n"
+                              "    for (iIndice = 1; iIndice <= (pnodeCurrent->usLen / 2); iIndice++) {\n"
+                              "        *pcData = gacHexChar[(*pcOctet >> 4) & 0x0F];\n"
+                              "    }\n"
+                              "}");
+        ASSERT_EQUALS("", errout.str()); // Don't write an error that "fValeur" is not used
     }
 
     void localvarNULL() { // #4203 - Setting NULL value is not redundant - it is safe

Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const`
`769`	`769`	`variables.clear();`
`770`	`770`	`break;`
`771`	`771`	`}`
`772`		`- if (Token::simpleMatch(tok, "goto")) { // https://sourceforge.net/apps/trac/cppcheck/ticket/4447`
	`772`	`+ if (Token::Match(tok, "goto\|break")) { // #4447`
`773`	`773`	`variables.clear();`
`774`	`774`	`break;`
`775`	`775`	`}`