memleak: Fixed false negative for sample

danmar · danmar · commit 474fed453e36 · 2019-08-18T19:45:39.000+02:00
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -735,7 +735,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
                 deallocUseError(tok, tok->str());
             } else if (Token::simpleMatch(tok->tokAt(-2), "= &")) {
                 varInfo->erase(tok->varId());
-            } else if (tok->strAt(-1) == "=") {
+            } else if (Token::Match(tok->previous(), "= %var% [;,)]")) {
                 varInfo->erase(tok->varId());
             }
         } else if (Token::Match(tok->previous(), "& %name% = %var% ;")) {
diff --git a/samples/memleak/out.txt b/samples/memleak/out.txt
@@ -0,0 +1,3 @@
+samples/memleak/bad.c:8:5: error: Memory leak: a [memleak]
+    return result;
+    ^

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t`
`735`	`735`	`deallocUseError(tok, tok->str());`
`736`	`736`	`} else if (Token::simpleMatch(tok->tokAt(-2), "= &")) {`
`737`	`737`	`varInfo->erase(tok->varId());`
`738`		`- } else if (tok->strAt(-1) == "=") {`
	`738`	`+ } else if (Token::Match(tok->previous(), "= %var% [;,)]")) {`
`739`	`739`	`varInfo->erase(tok->varId());`
`740`	`740`	`}`
`741`	`741`	`} else if (Token::Match(tok->previous(), "& %name% = %var% ;")) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+samples/memleak/bad.c:8:5: error: Memory leak: a [memleak]`
	`2`	`+ return result;`
	`3`	`+ ^`