Extend

danmar · May 10, 2024 · c296c8d · c296c8d
1 parent edf77af
commit c296c8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -401,7 +401,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             if (Token::simpleMatch(tokAssignOp->astOperand1(), "."))
                 continue;
             // taking address of another variable..
-            if (Token::Match(tokAssignOp, "= %var% [+;?]")) {
+            if (Token::Match(tokAssignOp, "= %var% +|;|?|%comp%")) {
                 if (varTok->tokAt(2)->varId() != varTok->varId()) {
                     // If variable points at allocated memory => error
                     leakIfAllocated(varTok, varInfo);

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -627,6 +627,12 @@ class TestLeakAutoVar : public TestFixture {
               "    x = p ? p : nullptr;\n"
             "}", true);
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(int*& x) {\n"
+              "    int* p = (int*)malloc(10);\n"
+              "    x = p != nullptr ? p : nullptr;\n"
+            "}", true);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void isAutoDealloc() {