Changeset 71747 in vbox for trunk/src/VBox/Devices/Audio/DevSB16.cpp

Timestamp:

Apr 8, 2018 2:34:55 PM (7 years ago)

Author:

vboxsync

Message:

DevSB16: mixer_regs should be 'uint8_t' rather than 'int', this way it cannot ever be out of bounds.

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -212 +212 @@
 
     /* mixer state */
-    int mixer_nreg;
+    uint8_t mixer_nreg;
     uint8_t mixer_regs[256];
 } SB16STATE, *PSB16STATE;
@@ -1548 +1548 @@
 }
 
-static int mixer_write_indexb(PSB16STATE pThis, uint32_t val)
+static int mixer_write_indexb(PSB16STATE pThis, uint8_t val)
 {
     pThis->mixer_nreg = val;
@@ -2176 +2176 @@
     SSMR3GetS32(pSSM, &pThis->csp_reg83w);
 
-    SSMR3GetMem(pSSM, pThis->in2_data, sizeof (pThis->in2_data));
-    SSMR3GetMem(pSSM, pThis->out_data, sizeof (pThis->out_data));
+    SSMR3GetMem(pSSM, pThis->in2_data, sizeof(pThis->in2_data));
+    SSMR3GetMem(pSSM, pThis->out_data, sizeof(pThis->out_data));
     SSMR3GetU8 (pSSM, &pThis->test_reg);
     SSMR3GetU8 (pSSM, &pThis->last_read_byte);
@@ -2187 +2187 @@
     SSMR3GetS32(pSSM, &pThis->align);
 
-    SSMR3GetS32(pSSM, &pThis->mixer_nreg);
-    SSMR3GetMem(pSSM, pThis->mixer_regs, 256);
+    int32_t mixer_nreg = 0;
+    int rc = SSMR3GetS32(pSSM, &mixer_nreg);
+    AssertRCReturn(rc, rc);
+    pThis->mixer_nreg = (uint8_t)mixer_nreg;
+    rc = SSMR3GetMem(pSSM, pThis->mixer_regs, 256);
+    AssertRCReturn(rc, rc);
 
 #if 0