Fix #12620 Crash in checkReturnByReference() (#6300)

danmar · Apr 17, 2024 · 3a212f1 · 3a212f1
1 parent 8b518bf
commit 3a212f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -3306,7 +3306,7 @@ void CheckClass::checkUselessOverride()
 }
 
 static const Variable* getSingleReturnVar(const Scope* scope) {
-    if (!scope)
+    if (!scope || !scope->bodyStart)
         return nullptr;
     const Token* const start = scope->bodyStart->next();
     const Token* const end = Token::findsimplematch(start, ";", 1, scope->bodyEnd);

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -8951,6 +8951,10 @@ class TestClass : public TestFixture {
                                "    std::string f(std::string s) { return s; }\n"
                                "};\n");
         ASSERT_EQUALS("", errout_str());
+
+        checkReturnByReference("struct S { S(); };\n" // #12620
+                               "S::S() = delete;\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
     }
 };