Fixed #7247 (False positive CastAddressToIntegerAtReturn - returning std::string)

lib/check64bit.cpp

@@ -53,6 +53,12 @@ void Check64BitPortability::pointerassignment()
             continue;
 
         for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
+            // skip nested functions
+            if (tok->str() == "{") {
+                if (tok->scope()->type == Scope::ScopeType::eFunction)
+                    tok = tok->link();
+            }
+
             if (tok->str() != "return")
                 continue;
 

test/test64bit.cpp

@@ -201,6 +201,14 @@ private:
               "  return mmio + (port_no * 0x80);\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        // #7247 : dont check return statements in nested functions..
+        check("int foo() {\n"
+              "  struct {\n"
+              "    const char * name() { return \"abc\"; }\n"
+              "  } table;\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 };