Changeset 48693 in vbox

Timestamp:

Sep 26, 2013 12:18:23 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89318

Message:

dbgmoddwarf.cpp: mach_kernel kludge.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp (modified) (1 diff)

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

@@ -3856 +3856 @@
                                                        rtDwarfInfo_SelectName(pSubProgram->pszName, pSubProgram->pszLinkageName),
                                                        iSeg, offSeg, cb, 0 /*fFlags*/, NULL /*piOrdinal*/);
-                                AssertMsg(RT_SUCCESS(rc) || rc == VERR_DBG_DUPLICATE_SYMBOL, ("%Rrc\n", rc));
+                                if (RT_FAILURE(rc))
+                                {
+                                    if (   rc == VERR_DBG_DUPLICATE_SYMBOL
+                                        || rc == VERR_DBG_ADDRESS_CONFLICT /** @todo figure why this happens with 10.6.8 mach_kernel, 32-bit. */
+                                        )
+                                        rc = VINF_SUCCESS;
+                                    else
+                                        AssertMsgFailed(("%Rrc\n", rc));
+                                }
                             }
                             else if (   pSubProgram->PcRange.uLowAddress  == 0 /* see with vmlinux */