Changeset 75130 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Oct 28, 2018 5:22:31 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/dbgmod: Don't assume pfnUnwindFrame is always present. bugref:3897

File:

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

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

@@ -2229 +2229 @@
      * Try the debug module first, then the image.
      */
-    int rc = pDbgMod->pDbgVt->pfnUnwindFrame(pDbgMod, iSeg, off, pState);
-    if (rc == VERR_DBG_NO_UNWIND_INFO)
-        rc = pDbgMod->pImgVt->pfnUnwindFrame(pDbgMod, iSeg, off, pState);
-    else if (rc == VERR_DBG_UNWIND_INFO_NOT_FOUND)
-    {
-        rc = pDbgMod->pImgVt->pfnUnwindFrame(pDbgMod, iSeg, off, pState);
+    int rc = VERR_DBG_NO_UNWIND_INFO;
+    if (pDbgMod->pDbgVt->pfnUnwindFrame)
+        rc = pDbgMod->pDbgVt->pfnUnwindFrame(pDbgMod, iSeg, off, pState);
+    if (   (   rc == VERR_DBG_NO_UNWIND_INFO
+            || rc == VERR_DBG_UNWIND_INFO_NOT_FOUND)
+        && pDbgMod->pImgVt
+        && pDbgMod->pImgVt->pfnUnwindFrame)
+    {
         if (rc == VERR_DBG_NO_UNWIND_INFO)
-            rc = VERR_DBG_UNWIND_INFO_NOT_FOUND;
+            rc = pDbgMod->pImgVt->pfnUnwindFrame(pDbgMod, iSeg, off, pState);
+        else
+        {
+            rc = pDbgMod->pImgVt->pfnUnwindFrame(pDbgMod, iSeg, off, pState);
+            if (rc == VERR_DBG_NO_UNWIND_INFO)
+                rc = VERR_DBG_UNWIND_INFO_NOT_FOUND;
+        }
     }