Fix FN unusedAllocatedMemory (f'up to #12332) (#6158)

See #6154
danmar · Mar 22, 2024 · 5dcf217 · 5dcf217
1 parent 427e8e9
commit 5dcf217
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/cfg/opencv2.cfg b/cfg/opencv2.cfg
@@ -69,7 +69,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <arg nr="1">
-      <not-uninit indirect="1"/>
+      <not-uninit/>
     </arg>
   </function>
   <!-- void * cv::fastMalloc (size_t bufSize) -->

diff --git a/lib/library.cpp b/lib/library.cpp
@@ -1075,20 +1075,26 @@ bool Library::isuninitargbad(const Token *ftok, int argnr, int indirect, bool *h
 /** get allocation info for function */
 const Library::AllocFunc* Library::getAllocFuncInfo(const Token *tok) const
 {
+    while (Token::simpleMatch(tok, "::"))
+        tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
     const std::string funcname = getFunctionName(tok);
     return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(mAlloc, funcname);
 }
 
 /** get deallocation info for function */
 const Library::AllocFunc* Library::getDeallocFuncInfo(const Token *tok) const
 {
+    while (Token::simpleMatch(tok, "::"))
+        tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
     const std::string funcname = getFunctionName(tok);
     return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(mDealloc, funcname);
 }
 
 /** get reallocation info for function */
 const Library::AllocFunc* Library::getReallocFuncInfo(const Token *tok) const
 {
+    while (Token::simpleMatch(tok, "::"))
+        tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
     const std::string funcname = getFunctionName(tok);
     return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(mRealloc, funcname);
 }

diff --git a/test/cfg/opencv2.cpp b/test/cfg/opencv2.cpp
@@ -30,7 +30,8 @@ void validCode(const char* argStr)
     cvStr += " World";
     std::cout << cvStr;
 
-    char * pBuf = (char *)cv::fastMalloc(20); // cppcheck-suppress cstyleCast
+    // cppcheck-suppress [cstyleCast, unusedAllocatedMemory]
+    char * pBuf = (char *)cv::fastMalloc(20);
     cv::fastFree(pBuf);
 }
 
@@ -42,7 +43,9 @@ void ignoredReturnValue()
 
 void memleak()
 {
-    const char * pBuf = (char *)cv::fastMalloc(1000); // cppcheck-suppress cstyleCast
-    std::cout << pBuf; // cppcheck-suppress valueFlowBailoutIncompleteVar
+    // cppcheck-suppress cstyleCast
+    const char * pBuf = (char *)cv::fastMalloc(1000);
+    // cppcheck-suppress [uninitdata, valueFlowBailoutIncompleteVar]
+    std::cout << pBuf;
     // cppcheck-suppress memleak
 }
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
@@ -2928,7 +2928,7 @@ void uninitvar_longjmp(void)
 void uninitvar_malloc(void)
 {
     size_t size;
-    // cppcheck-suppress [uninitvar, cstyleCast]
+    // cppcheck-suppress [uninitvar, cstyleCast, unusedAllocatedMemory]
     int *p = (int*)std::malloc(size);
     free(p);
 }
@@ -4957,7 +4957,7 @@ void std_vector_data_arithmetic()
 
 void memleak_std_malloc() // #12332
 {
-    //cppcheck-suppress [unreadVariable, constVariablePointer]
+    //cppcheck-suppress [unreadVariable, constVariablePointer, unusedAllocatedMemory]
     void* p = std::malloc(1);
     //cppcheck-suppress memleak
 }
@@ -4971,7 +4971,7 @@ void memleak_std_realloc(void* block, size_t newsize)
 
 void unusedAllocatedMemory_std_free()
 {
-    // TODO cppcheck-suppress unusedAllocatedMemory
+    // cppcheck-suppress unusedAllocatedMemory
     void* p = std::malloc(1);
     std::free(p);
 }