Changeset 104612 in vbox

Timestamp:

May 13, 2024 4:10:11 PM (12 months ago)

Author:

vboxsync

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

163154

Message:

Debugger/DBGCRemoteKd.cpp: Error handling fixes, bugref:3409

File:

• trunk/src/VBox/Debugger/DBGCRemoteKd.cpp (modified) (4 diffs)

trunk/src/VBox/Debugger/DBGCRemoteKd.cpp

@@ -2866 +2866 @@
         if (RT_SUCCESS(rc))
             rc = DBGFR3RegCpuQueryU16(pThis->Dbgc.pUVM, pThis->Dbgc.idCpu, DBGFREG_FS, &StateChange64.uCtrlReport.Amd64.u16SegFs);
-
-        /* Read instruction bytes. */
-        StateChange64.uCtrlReport.Amd64.cbInsnStream = sizeof(StateChange64.uCtrlReport.Amd64.abInsn);
-        rc = DBGFR3MemRead(pThis->Dbgc.pUVM, pThis->Dbgc.idCpu, &AddrRip,
-                           &StateChange64.uCtrlReport.Amd64.abInsn[0], StateChange64.uCtrlReport.Amd64.cbInsnStream);
         if (RT_SUCCESS(rc))
         {
-            pThis->idPktNext = KD_PACKET_HDR_ID_INITIAL;
-            rc = dbgcKdCtxPktSend(pThis, KD_PACKET_HDR_SIGNATURE_DATA, KD_PACKET_HDR_SUB_TYPE_STATE_CHANGE64,
-                                  &StateChange64, sizeof(StateChange64), false /*fAck*/);
+            /* Read instruction bytes. */
+            StateChange64.uCtrlReport.Amd64.cbInsnStream = sizeof(StateChange64.uCtrlReport.Amd64.abInsn);
+            rc = DBGFR3MemRead(pThis->Dbgc.pUVM, pThis->Dbgc.idCpu, &AddrRip,
+                               &StateChange64.uCtrlReport.Amd64.abInsn[0], StateChange64.uCtrlReport.Amd64.cbInsnStream);
+            if (RT_SUCCESS(rc))
+            {
+                pThis->idPktNext = KD_PACKET_HDR_ID_INITIAL;
+                rc = dbgcKdCtxPktSend(pThis, KD_PACKET_HDR_SIGNATURE_DATA, KD_PACKET_HDR_SUB_TYPE_STATE_CHANGE64,
+                                      &StateChange64, sizeof(StateChange64), false /*fAck*/);
+            }
         }
     }
@@ -2914 +2916 @@
                                                      &Resp.u.GetVersion.u64PtrKernBase,
                                                      &Resp.u.GetVersion.u64PtrPsLoadedModuleList);
+        if (RT_FAILURE(rc))
+            LogRel(("DBGC/Kd: Failed to query WIndows version or kernel pointers rc=%Rrc\n", rc));
     }
 
@@ -4115 +4119 @@
             }
 
-            rc = dbgcKdCtxStateChangeSend(pThis, pEvent->enmType);
+            if (RT_SUCCESS(rc))
+                rc = dbgcKdCtxStateChangeSend(pThis, pEvent->enmType);
             break;
         }
@@ -4214 +4219 @@
                     else
                         rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: %s!", pEvtDesc->pszName);
-                    if (pEvent->u.Generic.cArgs <= 1)
-                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, " arg=%#llx\n", pEvent->u.Generic.auArgs[0]);
-                    else
+                    if (RT_SUCCESS(rc))
                     {
-                        for (uint32_t i = 0; i < pEvent->u.Generic.cArgs; i++)
-                            rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, " args[%u]=%#llx", i, pEvent->u.Generic.auArgs[i]);
-                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\n");
+                        if (pEvent->u.Generic.cArgs <= 1)
+                            rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, " arg=%#llx\n", pEvent->u.Generic.auArgs[0]);
+                        else
+                        {
+                            for (uint32_t i = 0; i < pEvent->u.Generic.cArgs; i++)
+                                rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, " args[%u]=%#llx", i, pEvent->u.Generic.auArgs[i]);
+                            if (RT_SUCCESS(rc))
+                                rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\n");
+                        }
                     }
                 }