Update checkmemoryleak.cpp

chrchr-github · web-flow · commit a6e901e6983a · 2026-04-10T11:40:37.000+02:00
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -947,7 +947,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 }
 
                 // Returning from function..
-                else if ((tok3->scope()->type != ScopeType::eLambda || tok3->scope() == variable->scope()) && tok3->str() == "return") {
+                else if (((tok3->scope()->type != ScopeType::eLambda && tok3->scope()->type != ScopeType::eSwitch) || tok3->scope() == variable->scope()) && tok3->str() == "return") {
                     // Returning from function without deallocating struct member?
                     if (!Token::Match(tok3, "return %varid% ;", structid) &&
                         !Token::Match(tok3, "return & %varid%", structid) &&

Original file line number	Diff line number	Diff line change
`@@ -947,7 +947,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari`
`947`	`947`	`}`
`948`	`948`
`949`	`949`	`// Returning from function..`
`950`		`- else if ((tok3->scope()->type != ScopeType::eLambda \|\| tok3->scope() == variable->scope()) && tok3->str() == "return") {`
	`950`	`+ else if (((tok3->scope()->type != ScopeType::eLambda && tok3->scope()->type != ScopeType::eSwitch) \|\| tok3->scope() == variable->scope()) && tok3->str() == "return") {`
`951`	`951`	`// Returning from function without deallocating struct member?`
`952`	`952`	`if (!Token::Match(tok3, "return %varid% ;", structid) &&`
`953`	`953`	`!Token::Match(tok3, "return & %varid%", structid) &&`