Changeset 71748 in vbox

Timestamp:

Apr 8, 2018 2:36:41 PM (7 years ago)

Author:

vboxsync

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

121850

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) (2 diffs)

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

@@ -1759 +1759 @@
 static DECLCALLBACK(int) mixer_read(PPDMDEVINS pDevIns, void *opaque, RTIOPORT nport, uint32_t *pu32, unsigned cb)
 {
-    RT_NOREF(pDevIns, cb);
+    RT_NOREF(pDevIns, cb, nport);
     PSB16STATE pThis = (PSB16STATE)opaque;
 
-    (void) nport;
 #ifndef DEBUG_SB16_MOST
-    if (pThis->mixer_nreg != 0x82) {
-        LogFlowFunc(("mixer_read[%#x] -> %#x\n",
-                pThis->mixer_nreg, pThis->mixer_regs[pThis->mixer_nreg]));
-    }
+    if (pThis->mixer_nreg != 0x82)
+        LogFlowFunc(("mixer_read[%#x] -> %#x\n", pThis->mixer_nreg, pThis->mixer_regs[pThis->mixer_nreg]));
 #else
-    LogFlowFunc(("mixer_read[%#x] -> %#x\n",
-            pThis->mixer_nreg, pThis->mixer_regs[pThis->mixer_nreg]));
+    LogFlowFunc(("mixer_read[%#x] -> %#x\n", pThis->mixer_nreg, pThis->mixer_regs[pThis->mixer_nreg]));
 #endif
     *pu32 = pThis->mixer_regs[pThis->mixer_nreg];
@@ -2227 +2223 @@
             sb16CloseOut(pThis);
 
-            int rc = sb16OpenOut(pThis, pCfg);
+            rc = sb16OpenOut(pThis, pCfg);
             AssertRC(rc);
         }