mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-06-21 14:19:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Fix potential filter rendering race condition

Browse Source 
The filters array should not be accessed without locking the filter
mutex.  This locks the filter mutex, grabs a reference to the first
filter, unlocks the mutex, renders the filter, and then releases the
reference.

Closes obsproject/obs-studio#1215
This commit is contained in:
sorayuki
2018-03-09 15:50:23 +08:00
committed by jp9000
parent 14b7b4790c
commit fc26e3cfcf
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libobs/obs-source.c
View File

@@ -1720,9 +1720,18 @@ static inline void obs_source_render_async_video(obs_source_t *source)
static inline void obs_source_render_filters(obs_source_t *source)
{
obs_source_t *first_filter;
pthread_mutex_lock(&source->filter_mutex);
first_filter = source->filters.array[0];
obs_source_addref(first_filter);
pthread_mutex_unlock(&source->filter_mutex);
source->rendering_filter = true;
obs_source_video_render(source->filters.array[0]);
obs_source_video_render(first_filter);
source->rendering_filter = false;
obs_source_release(first_filter);
}
void obs_source_default_render(obs_source_t *source)