Changeset 99559 in vbox

Timestamp:

Apr 28, 2023 2:30:50 PM (19 months ago)

Author:

vboxsync

Message:

Audio: Improved range checks for audio channels (PDMAUDIO_MAX_CHANNELS).

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioinline.h (modified) (3 diffs)
• src/VBox/Devices/Audio/AudioTest.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudioinline.h

@@ -407 +407 @@
 DECLINLINE(void) PDMAudioPropsInit(PPDMAUDIOPCMPROPS pProps, uint8_t cbSample, bool fSigned, uint8_t cChannels, uint32_t uHz)
 {
+    Assert(cChannels <= PDMAUDIO_MAX_CHANNELS);
+
     pProps->cbFrame     = cbSample * cChannels;
     pProps->cbSampleX   = cbSample;
@@ -429 +431 @@
                                      bool fLittleEndian, bool fRaw)
 {
+    Assert(cChannels <= PDMAUDIO_MAX_CHANNELS);
     Assert(!fRaw || cbSample == sizeof(int64_t));
     pProps->cbFrame     = cbSample * cChannels;
@@ -503 +506 @@
 DECL_FORCE_INLINE(uint8_t) PDMAudioPropsChannels(PCPDMAUDIOPCMPROPS pProps)
 {
+    AssertReturn(pProps->cChannelsX <= PDMAUDIO_MAX_CHANNELS, PDMAUDIO_MAX_CHANNELS);
     return pProps->cChannelsX;
 }

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

@@ -3276 +3276 @@
                                   uBuf.Wave.u.FmtExt.Data.fChannelMask,
                                   audioTestWaveCountBits(uBuf.Wave.u.FmtExt.Data.fChannelMask), uBuf.Wave.u.Fmt.Data.cChannels);
+                else if (uBuf.Wave.u.Fmt.Data.cChannels > PDMAUDIO_MAX_CHANNELS)
+                    RTErrInfoSetF(pErrInfo, rc, "More than %u channels are not supported (%u given)",
+                                  PDMAUDIO_MAX_CHANNELS, uBuf.Wave.u.Fmt.Data.cChannels);
                 else if (   uBuf.Wave.u.Fmt.Data.uFormatTag == RTRIFFWAVEFMT_TAG_EXTENSIBLE
                          && RTUuidCompareStr(&uBuf.Wave.u.FmtExt.Data.SubFormat, RTRIFFWAVEFMTEXT_SUBTYPE_PCM) != 0)
@@ -3297 +3300 @@
                                                           - (unsigned)PDMAUDIOCHANNELID_FIRST_STANDARD;
                         unsigned                iCh       = 0;
-                        for (unsigned idCh = 0; idCh < 32 && iCh < uBuf.Wave.u.Fmt.Data.cChannels; idCh++)
+                        for (unsigned idCh = 0; idCh < PDMAUDIO_MAX_CHANNELS && iCh < uBuf.Wave.u.Fmt.Data.cChannels; idCh++)
                             if (uBuf.Wave.u.FmtExt.Data.fChannelMask & RT_BIT_32(idCh))
                             {