[PATCH 0/1] MR7926: dsound/tests: Allocate right amount of memory in test_secondary8 (ASan).

[Alex Henrie (＠alexhenrie)]

The wave format is passed to DirectSoundDevice_CreateSoundBuffer, which
duplicates it including the 1 byte of extra data after the end of the
struct.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7926

[PATCH 1/1] dsound/tests: Allocate right amount of memory in test_secondary8 (ASan).

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

The wave format is passed to DirectSoundDevice_CreateSoundBuffer, which
duplicates it including the 1 byte of extra data after the end of the
struct.
---
 dlls/dsound/tests/dsound8.c | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
index e95800af83e..30f548b9068 100644
--- a/dlls/dsound/tests/dsound8.c
+++ b/dlls/dsound/tests/dsound8.c
@@ -728,7 +728,7 @@ static HRESULT test_secondary8(LPGUID lpGuid)
 
         for (f = 0; f < ARRAY_SIZE(formats); f++) {
           for (tag = 0; tag < ARRAY_SIZE(format_tags); tag++) {
-            WAVEFORMATEXTENSIBLE wfxe;
+            WAVEFORMATEXTENSIBLE *wfxe = calloc(1, sizeof(*wfxe) + 1);
 
             /* if float, we only want to test 32-bit */
             if ((format_tags[tag] == WAVE_FORMAT_IEEE_FLOAT) && (formats[f][1] != 32))
@@ -770,13 +770,13 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 IDirectSoundBuffer_Release(secondary);
             secondary = NULL;
 
-            bufdesc.lpwfxFormat=(WAVEFORMATEX*)&wfxe;
-            wfxe.Format = wfx;
-            wfxe.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-            wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT);
-            wfxe.Format.cbSize = 1;
-            wfxe.Samples.wValidBitsPerSample = wfx.wBitsPerSample;
-            wfxe.dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO);
+            bufdesc.lpwfxFormat = (WAVEFORMATEX*)wfxe;
+            wfxe->Format = wfx;
+            wfxe->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
+            wfxe->SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT);
+            wfxe->Format.cbSize = 1;
+            wfxe->Samples.wValidBitsPerSample = wfx.wBitsPerSample;
+            wfxe->dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO);
 
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok(rc==DSERR_INVALIDPARAM && !secondary,
@@ -788,7 +788,7 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 secondary=NULL;
             }
 
-            wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1;
+            wfxe->Format.cbSize = sizeof(*wfxe) - sizeof(wfx) + 1;
 
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary)
@@ -801,8 +801,8 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 secondary=NULL;
             }
 
-            wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx);
-            wfxe.SubFormat = GUID_NULL;
+            wfxe->Format.cbSize = sizeof(*wfxe) - sizeof(wfx);
+            wfxe->SubFormat = GUID_NULL;
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary,
                 "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n",
@@ -813,7 +813,7 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 secondary=NULL;
             }
 
-            wfxe.Format.cbSize = sizeof(wfxe);
+            wfxe->Format.cbSize = sizeof(*wfxe);
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary,
                 "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n",
@@ -824,7 +824,7 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 secondary=NULL;
             }
 
-            wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT);
+            wfxe->SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT);
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok(rc==DS_OK && secondary,
                 "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n",
@@ -835,7 +835,7 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 secondary=NULL;
             }
 
-            wfxe.Format.cbSize = sizeof(wfxe) + 1;
+            wfxe->Format.cbSize = sizeof(*wfxe) + 1;
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary)
                 || rc==DS_OK /* driver dependent? */,
@@ -847,8 +847,8 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 secondary=NULL;
             }
 
-            wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx);
-            ++wfxe.Samples.wValidBitsPerSample;
+            wfxe->Format.cbSize = sizeof(*wfxe) - sizeof(wfx);
+            ++wfxe->Samples.wValidBitsPerSample;
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok(rc==DSERR_INVALIDPARAM && !secondary,
                 "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n",
@@ -858,9 +858,9 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 IDirectSoundBuffer_Release(secondary);
                 secondary=NULL;
             }
-            --wfxe.Samples.wValidBitsPerSample;
+            --wfxe->Samples.wValidBitsPerSample;
 
-            wfxe.Samples.wValidBitsPerSample = 0;
+            wfxe->Samples.wValidBitsPerSample = 0;
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok(rc==DS_OK && secondary,
                 "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n",
@@ -870,7 +870,7 @@ static HRESULT test_secondary8(LPGUID lpGuid)
                 IDirectSoundBuffer_Release(secondary);
                 secondary=NULL;
             }
-            wfxe.Samples.wValidBitsPerSample = wfxe.Format.wBitsPerSample;
+            wfxe->Samples.wValidBitsPerSample = wfxe->Format.wBitsPerSample;
 
             rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
             ok(rc==DS_OK && secondary!=NULL,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7926