Changeset 77185 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Feb 6, 2019 7:46:49 PM (6 years ago)

Author:

vboxsync

Message:

Runtime/common/ldr: Fix memory leak caused by missing unmapping calls

Location:

trunk/src/VBox/Runtime/common/ldr

Files:

• ldrELFRelocatable.cpp.h (modified) (1 diff)
• ldrFile.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

@@ -677 +677 @@
     }
 
-    pModElf->pvBits = NULL;
+    if (pModElf->pvBits)
+    {
+        pModElf->Core.pReader->pfnUnmap(pModElf->Core.pReader, pModElf->pvBits);
+        pModElf->pvBits = NULL;
+    }
 
     return VINF_SUCCESS;

trunk/src/VBox/Runtime/common/ldr/ldrFile.cpp

@@ -186 +186 @@
     int rc = VINF_SUCCESS;
     PRTLDRREADERFILE pFileReader = (PRTLDRREADERFILE)pReader;
+
+    Assert(!pFileReader->cMappings);
+
     if (pFileReader->hFile != NIL_RTFILE)
     {
@@ -192 +195 @@
         pFileReader->hFile = NIL_RTFILE;
     }
+
+    if (pFileReader->pvMapping)
+    {
+        RTMemFree(pFileReader->pvMapping);
+        pFileReader->pvMapping = NULL;
+    }
+
     RTMemFree(pFileReader);
     return rc;