Update checkautovariables.cpp

chrchr-github · web-flow · commit 834570e3211f · 2026-05-20T16:40:55.000+02:00
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
@@ -614,8 +614,11 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                 }
             }
         }
-        const bool escape = Token::simpleMatch(tok->astParent(), "throw") ||
-                            (Token::simpleMatch(tok->astParent(), "return") && !Function::returnsStandardType(scope->function));
+        const Token* retThrow = tok->astParent();
+        if (Token::simpleMatch(retThrow, "new"))
+            retThrow = retThrow->astParent();
+        const bool escape = Token::simpleMatch(retThrow, "throw") ||
+                            (Token::simpleMatch(retThrow, "return") && !Function::returnsStandardType(scope->function));
         std::unordered_set<const Token*> exprs;
         for (const ValueFlow::Value& val:tok->values()) {
             if (!val.isLocalLifetimeValue() && !val.isSubFunctionLifetimeValue())

Original file line number	Diff line number	Diff line change
`@@ -614,8 +614,11 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token`
`614`	`614`	`}`
`615`	`615`	`}`
`616`	`616`	`}`
`617`		`- const bool escape = Token::simpleMatch(tok->astParent(), "throw") \|\|`
`618`		`- (Token::simpleMatch(tok->astParent(), "return") && !Function::returnsStandardType(scope->function));`
	`617`	`+ const Token* retThrow = tok->astParent();`
	`618`	`+ if (Token::simpleMatch(retThrow, "new"))`
	`619`	`+ retThrow = retThrow->astParent();`
	`620`	`+ const bool escape = Token::simpleMatch(retThrow, "throw") \|\|`
	`621`	`+ (Token::simpleMatch(retThrow, "return") && !Function::returnsStandardType(scope->function));`
`619`	`622`	`std::unordered_set<const Token*> exprs;`
`620`	`623`	`for (const ValueFlow::Value& val:tok->values()) {`
`621`	`624`	`if (!val.isLocalLifetimeValue() && !val.isSubFunctionLifetimeValue())`