Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WASAPIStream: Fix crash when GetBuffer call fails

Browse Source 
Check the return value of calls to `GetBuffer` and stop the `WASAPI
handler` sound thread if they fail.

This prevents a crash due to a null pointer dereference if `GetBuffer`
is unable to retrieve a buffer, which could be triggered during
emulation by disabling the selected WASAPI output device in the Windows
Sound settings.
This commit is contained in:
Dentomologist
2026-03-13 20:29:58 -07:00
parent 7a45ede688
commit e8a78ed95f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/AudioCommon/WASAPIStream.cpp
+12 -2
View File
@@ -320,14 +320,24 @@ void WASAPIStream::SoundLoop()
Common::SetCurrentThreadName("WASAPI Handler"); Common::SetCurrentThreadName("WASAPI Handler");
BYTE* data; 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); m_audio_renderer->ReleaseBuffer(m_frames_in_buffer, AUDCLNT_BUFFERFLAGS_SILENT);
while (m_running.load(std::memory_order_relaxed)) while (m_running.load(std::memory_order_relaxed))
{ {
WaitForSingleObject(m_need_data_event.get(), 1000); 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); s16* audio_data = reinterpret_cast<s16*>(data);
GetMixer()->Mix(audio_data, m_frames_in_buffer); GetMixer()->Mix(audio_data, m_frames_in_buffer);