cppcheck-opensource
diff --git a/‎lib/checkleakautovar.cpp‎
Lines changed: 2 additions & 1 deletion b/‎lib/checkleakautovar.cpp‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎test/cfg/posix.c‎
Lines changed: 30 additions & 0 deletions b/‎test/cfg/posix.c‎
Lines changed: 30 additions & 0 deletions
@@ -477,9 +477,10 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 // check for function call
                 const Token * const openingPar = isFunctionCall(innerTok);
                 if (openingPar) {
+                    const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(innerTok);
                     // innerTok is a function name
                     const VarInfo::AllocInfo allocation(0, VarInfo::NOALLOC);
-                    functionCall(innerTok, openingPar, varInfo, allocation, nullptr);
+                    functionCall(innerTok, openingPar, varInfo, allocation, allocFunc);
                     innerTok = openingPar->link();
                 }
             }
 
@@ -892,6 +892,36 @@ void * identicalCondition_mmap(int fd, size_t size) // #9940
     return buffer;
 }
 
+int munmap_no_double_free(int tofd, // #11396
+                          int fromfd,
+                          size_t len)
+{
+    int rc;
+    void* fptr = mmap(NULL,len,PROT_READ|PROT_WRITE,MAP_SHARED,fromfd,(off_t)0);
+    if (fptr == MAP_FAILED) {
+        return -1;
+    }
+
+    void* tptr = mmap(NULL,len,PROT_READ|PROT_WRITE,MAP_SHARED,tofd,(off_t)0);
+    if (tptr == MAP_FAILED) {
+        // cppcheck-suppress memleak
+        return -1;
+    }
+
+    memcpy(tptr,fptr,len);
+
+    if ((rc = munmap(fptr,len)) != 0) {
+        // cppcheck-suppress memleak
+        return -1;
+    }
+
+    if ((rc = munmap(tptr,len)) != 0) {
+        return -1;
+    }
+
+    return rc;
+}
+
 void resourceLeak_fdopen(int fd)
 {
     // cppcheck-suppress unreadVariable
Original file line number	Diff line number	Diff line change
`@@ -477,9 +477,10 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,`
`477`	`477`	`// check for function call`
`478`	`478`	`const Token * const openingPar = isFunctionCall(innerTok);`
`479`	`479`	`if (openingPar) {`
	`480`	`+ const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(innerTok);`
`480`	`481`	`// innerTok is a function name`
`481`	`482`	`const VarInfo::AllocInfo allocation(0, VarInfo::NOALLOC);`
`482`		`- functionCall(innerTok, openingPar, varInfo, allocation, nullptr);`
	`483`	`+ functionCall(innerTok, openingPar, varInfo, allocation, allocFunc);`
`483`	`484`	`innerTok = openingPar->link();`
`484`	`485`	`}`
`485`	`486`	`}`