Changeset 32082 in vbox for trunk/src/VBox

Timestamp:

Aug 30, 2010 10:01:36 AM (14 years ago)

Author:

vboxsync

Message:

CD/Passthrough: Prevent the host from crashing when trying to access a audio CD with passthrough enabled

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (2 diffs)
• DevATA.cpp (modified) (2 diffs)

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

@@ -3510 +3510 @@
             case SCSI_READ_CD:
                 iATAPILBA = ataBE2H_U32(pAhciPortTaskState->aATAPICmd + 2);
-                cSectors = ataBE2H_U24(pAhciPortTaskState->aATAPICmd + 6) / pAhciPortTaskState->cbATAPISector;
+                cSectors = ataBE2H_U24(pAhciPortTaskState->aATAPICmd + 6);
                 break;
             case SCSI_READ_CD_MSF:
@@ -4197 +4197 @@
         case SCSI_READ_CD:
             pAhciPortTaskState->cbATAPISector = 2048; /**< @todo this size is not always correct */
-            cbTransfer = ataBE2H_U24(pbPacket + 6) / pAhciPortTaskState->cbATAPISector * pAhciPortTaskState->cbATAPISector;
+            cbTransfer = ataBE2H_U24(pbPacket + 6) * pAhciPortTaskState->cbATAPISector;
             enmTxDir = AHCITXDIR_READ;
             goto sendcmd;

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

@@ -1935 +1935 @@
             case SCSI_READ_CD:
                 iATAPILBA = ataBE2H_U32(s->aATAPICmd + 2);
-                cSectors = ataBE2H_U24(s->aATAPICmd + 6) / s->cbATAPISector;
+                cSectors = ataBE2H_U24(s->aATAPICmd + 6);
                 break;
             case SCSI_READ_CD_MSF:
@@ -3190 +3190 @@
         case SCSI_READ_CD:
             s->cbATAPISector = 2048; /**< @todo this size is not always correct */
-            cbTransfer = ataBE2H_U24(pbPacket + 6) / s->cbATAPISector * s->cbATAPISector;
+            cbTransfer = ataBE2H_U24(pbPacket + 6) * s->cbATAPISector;
             uTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
             goto sendcmd;