xaudio2: Protect access to submix voice during creation (Coverity).

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

xaudio2: Protect access to submix voice during creation (Coverity).
7bb885a3 · Andrew Eikum · Alexandre Julliard · 2c82e8b4 · 7bb885a3
Commit 7bb885a3 authored Feb 10, 2016 by Andrew Eikum Committed by Alexandre Julliard Feb 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

xaudio_dll.c dlls/xaudio2_7/xaudio_dll.c +5 -0

No files found.
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -1475,8 +1475,10 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,
    EnterCriticalSection(&This->lock);

    LIST_FOR_EACH_ENTRY(sub, &This->submix_voices, XA2SubmixImpl, entry){
+        EnterCriticalSection(&sub->lock);
        if(!sub->in_use)
            break;
+        LeaveCriticalSection(&sub->lock);
    }

    if(&sub->entry == &This->submix_voices){
@@ -1498,11 +1500,14 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface,

        InitializeCriticalSection(&sub->lock);
        sub->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SubmixImpl.lock");
+
+        EnterCriticalSection(&sub->lock);
    }

    sub->in_use = TRUE;

    LeaveCriticalSection(&This->lock);
+    LeaveCriticalSection(&sub->lock);

 #if XAUDIO2_VER == 0
    *ppSubmixVoice = (IXAudio2SubmixVoice*)&sub->IXAudio20SubmixVoice_iface;