etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-03 00:27:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

source-mirror: Fix crash with audio data on obs_shutdown (#22)

Browse source 
Due to the lack of checking aud and aoi, a rare race condition crash can be observed with audio mirroring enabled on closing OBS. In this case, aoi is used even though it is null, causing OBS to crash instead of closing normally.

Fixes #22
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2018-11-07 14:43:43 +01:00
parent b5339b4429
commit 16f55ca583
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/source-mirror.cpp
View file

@ -499,7 +499,13 @@ void Source::Mirror::audio_capture_cb(void*, const audio_data* audio, bool) {
} }
audio_t* aud = obs_get_audio(); audio_t* aud = obs_get_audio();
if (!aud) {
return;
}
audio_output_info const* aoi = audio_output_get_info(aud); audio_output_info const* aoi = audio_output_get_info(aud);
if (!aoi) {
return;
}
std::bitset<8> layout; std::bitset<8> layout;
for (size_t plane = 0; plane < MAX_AV_PLANES; plane++) { for (size_t plane = 0; plane < MAX_AV_PLANES; plane++) {