Changeset 90778 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Aug 23, 2021 8:55:48 AM (4 years ago)

Author:

vboxsync

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

146412

Message:

DrvhostAudioWasApi: Deal with PKEY_AudioEngine_DeviceFormat returning a NULL pointer. ticketref:20516

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (2 diffs)

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

@@ -1522 +1522 @@
                 {
                     WAVEFORMATEX const * const pFormat = (WAVEFORMATEX const *)VarFormat.blob.pBlobData;
-                    AssertPtr(pFormat);
+                    AssertPtr(pFormat); /* Observed sometimes being NULL on windows 7 sp1. */
 
                     /*
@@ -1540 +1540 @@
                             pDev->Core.fFlags = enmType == eRender ? PDMAUDIOHOSTDEV_F_DEFAULT_OUT : PDMAUDIOHOSTDEV_F_DEFAULT_IN;
                         if (enmType == eRender)
-                            pDev->Core.cMaxOutputChannels = pFormat->nChannels;
+                            pDev->Core.cMaxOutputChannels = RT_VALID_PTR(pFormat) ? pFormat->nChannels : 2;
                         else
-                            pDev->Core.cMaxInputChannels  = pFormat->nChannels;
+                            pDev->Core.cMaxInputChannels  = RT_VALID_PTR(pFormat) ? pFormat->nChannels : 1;
 
                         memcpy(pDev->wszDevId, pwszDevId, cwcDevId * sizeof(RTUTF16));