Changeset 46260 in vbox for trunk/src

Timestamp:

May 24, 2013 7:23:08 PM (12 years ago)

Author:

vboxsync

Message:

dbgmoddwarf.cpp: Fixed leakes and adjustments for loading vmlinux.

File:

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

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

@@ -1471 +1471 @@
     }
 
-    return pThis->pImgMod->pImgVt->pfnRvaToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
-    //return pThis->pImgMod->pImgVt->pfnLinkAddressToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
+    //return pThis->pImgMod->pImgVt->pfnRvaToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
+    return pThis->pImgMod->pImgVt->pfnLinkAddressToSegOffset(pThis->pImgMod, LinkAddress, piSeg, poffSeg);
 }
 
@@ -2335 +2335 @@
         RTUINTPTR   offSeg;
         rc = rtDbgModDwarfLinkAddressToSegOffset(pLnState->pDwarfMod, pLnState->Regs.uSegment, pLnState->Regs.uAddress,
-                                                 &iSeg, &offSeg); AssertRC(rc);
+                                                 &iSeg, &offSeg); /*AssertRC(rc);*/
         if (RT_SUCCESS(rc))
         {
@@ -3706 +3706 @@
                                                                      pSubProgram->PcRange.uLowAddress,
                                                                      &iSeg, &offSeg);
-                            AssertRC(rc);
                             if (RT_SUCCESS(rc))
                             {
@@ -3714 +3713 @@
                                 AssertMsg(RT_SUCCESS(rc) || rc == VERR_DBG_DUPLICATE_SYMBOL, ("%Rrc\n", rc));
                             }
+                            else if (   pSubProgram->PcRange.uLowAddress  == 0 /* see with vmlinux */
+                                     && pSubProgram->PcRange.uHighAddress == 0)
+                            {
+                                Log5(("rtDbgModDwarfLinkAddressToSegOffset: Ignoring empty range.\n"));
+                                rc = VINF_SUCCESS; /* ignore */
+                            }
                             else
+                            {
+                                AssertRC(rc);
                                 Log5(("rtDbgModDwarfLinkAddressToSegOffset failed: %Rrc\n", rc));
+                            }
                         }
                     }
@@ -3850 +3858 @@
 
 /**
+ * Free all children of a DIE.
+ *
+ * @param   pThis               The DWARF instance.
+ * @param   pParent             The parent DIE.
+ */
+static void rtDwarfInfo_FreeChildren(PRTDBGMODDWARF pThis, PRTDWARFDIE pParentDie)
+{
+    PRTDWARFDIE pChild, pNextChild;
+    RTListForEachSafe(&pParentDie->ChildList, pChild, pNextChild, RTDWARFDIE, SiblingNode)
+    {
+        if (!RTListIsEmpty(&pChild->ChildList))
+            rtDwarfInfo_FreeChildren(pThis, pChild);
+        RTListNodeRemove(&pChild->SiblingNode);
+#ifdef RTDBGMODDWARF_WITH_MEM_CACHE
+        RTMemCacheFree(pThis->aDieAllocators[pChild->iAllocator].hMemCache, pChild);
+#else
+        RTMemFree(pChild);
+#endif
+    }
+}
+
+
+/**
+ * Free a DIE an all its children.
+ *
+ * @param   pThis               The DWARF instance.
+ * @param   pDie                The DIE to free.
+ */
+static void rtDwarfInfo_FreeDie(PRTDBGMODDWARF pThis, PRTDWARFDIE pDie)
+{
+    rtDwarfInfo_FreeChildren(pThis, pDie);
+    RTListNodeRemove(&pDie->SiblingNode);
+#ifdef RTDBGMODDWARF_WITH_MEM_CACHE
+    RTMemCacheFree(pThis->aDieAllocators[pDie->iAllocator].hMemCache, pDie);
+#else
+    RTMemFree(pChild);
+#endif
+}
+
+
+/**
  * Skips a form.
  * @returns IPRT status code
@@ -4123 +4172 @@
             }
             cDepth--;
-
-            /* Unlink and free child DIEs if told to do so. */
             if (!fKeepDies && pParentDie->pParent)
-            {
-                PRTDWARFDIE pChild, pNextChild;
-                RTListForEachSafe(&pParentDie->ChildList, pChild, pNextChild, RTDWARFDIE, SiblingNode)
-                {
-                    RTListNodeRemove(&pChild->SiblingNode);
-#ifdef RTDBGMODDWARF_WITH_MEM_CACHE
-                    RTMemCacheFree(pThis->aDieAllocators[pChild->iAllocator].hMemCache, pChild);
-#else
-                    RTMemFree(pChild);
-#endif
-                }
-            }
+                rtDwarfInfo_FreeChildren(pThis, pParentDie);
         }
         else
@@ -4181 +4217 @@
             if (RT_FAILURE(rc))
                 return rc;
+
+            if (!fKeepDies && !pAbbrev->fChildren)
+                rtDwarfInfo_FreeDie(pThis, pNewDie);
         }
     } /* while more DIEs */
+
+
+    /* Unlink and free child DIEs if told to do so. */
+    if (!fKeepDies)
+        rtDwarfInfo_FreeChildren(pThis, &pUnit->Core);
 
     return RT_SUCCESS(rc) ? pCursor->rc : rc;