Changeset 57167 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 4, 2015 9:52:02 AM (10 years ago)

Author:

vboxsync

Message:

VMM: Fix crash while dumping guest core.

File:

• trunk/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp

@@ -313 +313 @@
  * Gets the guest-CPU context suitable for dumping into the core file.
  *
+ * @param   pVM         Pointer to the VM.
  * @param   pCtx        Pointer to the guest-CPU context.
  * @param   pDbgfCpu    Where to dump the guest-CPU data.
  */
-static void dbgfR3GetCoreCpu(PCPUMCTX pCtx, PDBGFCORECPU pDbgfCpu)
+static void dbgfR3GetCoreCpu(PVM pVM, PCPUMCTX pCtx, PDBGFCORECPU pDbgfCpu)
 {
 #define DBGFCOPYSEL(a_dbgfsel, a_cpumselreg) \
@@ -376 +377 @@
     pDbgfCpu->aXcr[1]         = pCtx->aXcr[1];
     AssertCompile(sizeof(pDbgfCpu->ext) == sizeof(*pCtx->pXStateR3));
-    memcpy(&pDbgfCpu->ext, pCtx->pXStateR3, sizeof(pDbgfCpu->ext));
+    pDbgfCpu->cbExt = CPUMR3GetGuestFpuExtStateSize(pVM);
+    if (RT_LIKELY(pDbgfCpu->cbExt))
+        memcpy(&pDbgfCpu->ext, pCtx->pXStateR3, cbExt);
 
 #undef DBGFCOPYSEL
@@ -522 +525 @@
 
         RT_BZERO(pDbgfCoreCpu, sizeof(*pDbgfCoreCpu));
-        dbgfR3GetCoreCpu(pCtx, pDbgfCoreCpu);
+        dbgfR3GetCoreCpu(pVM, pCtx, pDbgfCoreCpu);
         rc = Elf64WriteNoteHdr(hFile, NT_VBOXCPU, g_pcszCoreVBoxCpu, pDbgfCoreCpu, sizeof(*pDbgfCoreCpu));
         if (RT_FAILURE(rc))