Changeset 77913 in vbox for trunk/src

Timestamp:

Mar 27, 2019 12:14:54 PM (6 years ago)

Author:

vboxsync

Message:

Runtmie/dbgmoddwarf.cpp: Fix possible memory leak in error case and possible NULL pointer dereference when parsing an empty tag descriptor bugref:9188

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp

@@ -649 +649 @@
 {
 #define TAGDESC(a_Name, a_pDesc)        { DW_ ## a_Name, #a_Name, a_pDesc }
-#define TAGDESC_EMPTY()                 { 0, NULL, NULL }
+#define TAGDESC_EMPTY()                 { 0, NULL, &g_CoreDieDesc }
 #define TAGDESC_CORE(a_Name)            TAGDESC(a_Name, &g_CoreDieDesc)
     TAGDESC_EMPTY(),                            /* 0x00 */
@@ -6187 +6187 @@
                         rc = rtDwarfLine_ExplodeAll(pThis);
                 }
+
+                /*
+                 * Free the cached abbreviations and unload all sections.
+                 */
+                pThis->cCachedAbbrevsAlloced = 0;
+                RTMemFree(pThis->paCachedAbbrevs);
+                pThis->paCachedAbbrevs = NULL;
+
+                for (unsigned iSect = 0; iSect < RT_ELEMENTS(pThis->aSections); iSect++)
+                    if (pThis->aSections[iSect].pv)
+                        pThis->pDbgInfoMod->pImgVt->pfnUnmapPart(pThis->pDbgInfoMod, pThis->aSections[iSect].cb,
+                                                                 &pThis->aSections[iSect].pv);
+
                 if (RT_SUCCESS(rc))
                 {
-                    /*
-                     * Free the cached abbreviations and unload all sections.
-                     */
-                    pThis->cCachedAbbrevsAlloced = 0;
-                    RTMemFree(pThis->paCachedAbbrevs);
-                    pThis->paCachedAbbrevs = NULL;
-
-                    for (unsigned iSect = 0; iSect < RT_ELEMENTS(pThis->aSections); iSect++)
-                        if (pThis->aSections[iSect].pv)
-                            pThis->pDbgInfoMod->pImgVt->pfnUnmapPart(pThis->pDbgInfoMod, pThis->aSections[iSect].cb,
-                                                                     &pThis->aSections[iSect].pv);
-
                     /** @todo Kill pThis->CompileUnitList and the alloc caches. */
                     return VINF_SUCCESS;
@@ -6214 +6215 @@
     }
 
-    RTMemFree(pThis->paCachedAbbrevs);
+    if (pThis->paCachedAbbrevs)
+        RTMemFree(pThis->paCachedAbbrevs);
+    pThis->paCachedAbbrevs = NULL;
+
+    for (unsigned iSect = 0; iSect < RT_ELEMENTS(pThis->aSections); iSect++)
+        if (pThis->aSections[iSect].pv)
+            pThis->pDbgInfoMod->pImgVt->pfnUnmapPart(pThis->pDbgInfoMod, pThis->aSections[iSect].cb,
+                                                     &pThis->aSections[iSect].pv);
 
 #ifdef RTDBGMODDWARF_WITH_MEM_CACHE