Changeset 40676 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 28, 2012 12:42:10 PM (13 years ago)

Author:

vboxsync

Message:

VBoxSCSI: Don't crash if a string I/O port access happens without a valid data buffer

File:

• trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp

@@ -346 +346 @@
     /* Read string only valid for data in register. */
     AssertMsg(iRegister == 1, ("Hey only register 1 can be read from with string\n"));
-    Assert(pVBoxSCSI->pBuf);
+
+    /* Accesses without a valid buffer will be ignored. */
+    if (!pVBoxSCSI->pBuf)
+        return VINF_SUCCESS;
 
     int rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pBuf, cbTransfer);
@@ -375 +378 @@
     /* Write string only valid for data in/out register. */
     AssertMsg(iRegister == 1, ("Hey only register 1 can be written to with string\n"));
+
+    /* Accesses without a valid buffer will be ignored. */
+    if (!pVBoxSCSI->pBuf)
+        return VINF_SUCCESS;
+
     Assert(cbTransfer == pVBoxSCSI->cbBuf);
     if (cbTransfer > pVBoxSCSI->cbBuf)