Merge pull request #14461 from Dentomologist/wasapistream_handle_getbuffer_errors

WASAPIStream: Fix crash when GetBuffer call fails

1 files changed, 12 insertions, 2 deletions

diff --git a/Source/Core/AudioCommon/WASAPIStream.cpp b/Source/Core/AudioCommon/WASAPIStream.cpp
index 0eabb910cd..afd5531ae8 100644
--- a/Source/Core/AudioCommon/WASAPIStream.cpp
+++ b/Source/Core/AudioCommon/WASAPIStream.cpp
@@ -320,14 +320,24 @@ void WASAPIStream::SoundLoop()
   Common::SetCurrentThreadName("WASAPI Handler");
   BYTE* data;
 
-  m_audio_renderer->GetBuffer(m_frames_in_buffer, &data);
+  HRESULT getbuffer_result = m_audio_renderer->GetBuffer(m_frames_in_buffer, &data);
+  if (getbuffer_result != S_OK)
+  {
+    m_running.store(false, std::memory_order_relaxed);
+    return;
+  }
   m_audio_renderer->ReleaseBuffer(m_frames_in_buffer, AUDCLNT_BUFFERFLAGS_SILENT);
 
   while (m_running.load(std::memory_order_relaxed))
   {
     WaitForSingleObject(m_need_data_event.get(), 1000);
 
-    m_audio_renderer->GetBuffer(m_frames_in_buffer, &data);
+    getbuffer_result = m_audio_renderer->GetBuffer(m_frames_in_buffer, &data);
+    if (getbuffer_result != S_OK)
+    {
+      m_running.store(false, std::memory_order_relaxed);
+      return;
+    }
 
     s16* audio_data = reinterpret_cast<s16*>(data);
     GetMixer()->Mix(audio_data, m_frames_in_buffer);