From a110fa001b331bcbce320fc4456911570af7e117 Mon Sep 17 00:00:00 2001 From: chrchr Date: Tue, 27 Jun 2023 14:41:18 +0200 Subject: [PATCH] Fix autovarInvalidDeallocation regression --- lib/checkautovariables.cpp | 2 +- test/testautovariables.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp index 8dca0990636..6e4322ebfad 100644 --- a/lib/checkautovariables.cpp +++ b/lib/checkautovariables.cpp @@ -303,7 +303,7 @@ void CheckAutoVariables::autoVariables() if (v.isImpossible()) continue; if ((v.isTokValue() && (isArrayVar(v.tokvalue) || ((v.tokvalue->tokType() == Token::eString)))) || - (v.isLocalLifetimeValue() && v.lifetimeKind == ValueFlow::Value::LifetimeKind::Address)) { + (v.isLocalLifetimeValue() && v.lifetimeKind == ValueFlow::Value::LifetimeKind::Address && !Token::simpleMatch(v.tokvalue, "("))) { errorInvalidDeallocation(tok, &v); break; } diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp index c4f8aa108f5..5fbe371f6a3 100644 --- a/test/testautovariables.cpp +++ b/test/testautovariables.cpp @@ -847,6 +847,12 @@ class TestAutoVariables : public TestFixture { " return 0;\n" "}\n"); ASSERT_EQUALS("", errout.str()); + + check("void f() {\n" + " S* p = &g();\n" + " delete p;\n" + "}\n"); + ASSERT_EQUALS("", errout.str()); } void testinvaliddealloc_input() {