Fix

Author: web-flow

lib/checkother.cpp

@@ -1335,6 +1335,8 @@ static bool isOnlyUsedInCurrentScope(const Variable* var, const Token *tok, cons
 {
     if (tok->scope() == scope)
         return true;
+    if (tok->scope()->type == ScopeType::eSwitch)
+        return false;
     return !Token::findmatch(tok->scope()->bodyEnd, "%varid%", scope->bodyEnd, var->declarationId());
 }
 

test/testother.cpp

@@ -1986,7 +1986,7 @@ class TestOther : public TestFixture {
     }
 
     void varScope46() {
-        check("void f() {\n"
+        check("void f() {\n" // #7091
               "    int y1;\n"
               "    for (int i = 0; i < 3; ++i) {\n"
               "        for(int j = 0; j < 3; ++j) {\n"
@@ -1997,6 +1997,24 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'y1' can be reduced. [variableScope]\n",
                       errout_str());
+
+        check("bool f() {\n"
+              "bool b = false;\n"
+              "do {\n"
+              "    switch (g()) {\n"
+              "        case 0:\n"
+              "            b = true;\n"
+              "            break;\n"
+              "        case 1:\n"
+              "            return b;\n"
+              "            break;\n"
+              "        default:\n"
+              "            break;\n"
+              "    }\n"
+              "}\n"
+              "while (true);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 #define checkOldStylePointerCast(...) checkOldStylePointerCast_(__FILE__, __LINE__, __VA_ARGS__)