missingReturn; Fixed false negative for goto-label

danmar · danmar · commit 53955b48d2d9 · 2021-07-10T08:49:48.000+02:00
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -314,6 +314,8 @@ static const Token *checkMissingReturnScope(const Token *tok)
         }
         if (tok->isKeyword() && Token::Match(tok, "return|throw"))
             return nullptr;
+        if (Token::Match(tok, "[;{}] %name% :"))
+            return tok;
         if (Token::Match(tok, "; !!}") && !lastStatement)
             lastStatement = tok->next();
     }
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -1386,6 +1386,13 @@ class TestFunctions : public TestFixture {
               "}");
         ASSERT_EQUALS("", errout.str());
 
+        check("int foo(int x) {\n"
+              "  if (x) goto out;\n"
+              "  return 1;\n"
+              "out:\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3]: (error) Found a exit path from function with non-void return type that has missing return statement\n", errout.str());
+
         // switch
         check("int f() {\n"
               "    switch (x) {\n"

Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,8 @@ static const Token checkMissingReturnScope(const Token tok)`
`314`	`314`	`}`
`315`	`315`	`if (tok->isKeyword() && Token::Match(tok, "return\|throw"))`
`316`	`316`	`return nullptr;`
	`317`	`+ if (Token::Match(tok, "[;{}] %name% :"))`
	`318`	`+ return tok;`
`317`	`319`	`if (Token::Match(tok, "; !!}") && !lastStatement)`
`318`	`320`	`lastStatement = tok->next();`
`319`	`321`	`}`