OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-07 03:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

image-source: Use mutex when accessing slideshow

Browse source 
While adding or updating files locked this mutex, the graphics thread
did not. As the update operation is not atomic, the graphics thread
might access the darray in the middle of an update, resulting in access
to freed memory (crash) if the files were updated at the same time.
This commit is contained in:
Richard Stanway 2021-09-08 22:52:39 +02:00 committed by Patrick Heyer
parent ef99553a7e
commit 87c536ebe0
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/image-source/obs-slideshow.c
View file

@ -738,8 +738,10 @@ static void ss_video_tick(void *data, float seconds)
{
struct slideshow *ss = data;
pthread_mutex_lock(&ss->mutex);
if (!ss->transition || !ss->slide_time)
return;
goto finish;
if (ss->restart_on_activate && ss->use_cut) {
ss->elapsed = 0.0f;
@ -748,11 +750,11 @@ static void ss_video_tick(void *data, float seconds)
ss->restart_on_activate = false;
ss->use_cut = false;
ss->stop = false;
return;
goto finish;
}
if (ss->pause_on_deactivate || ss->manual || ss->stop || ss->paused)
return;
goto finish;
/* ----------------------------------------------------- */
/* fade to transparency when the file list becomes empty */
@ -779,11 +781,14 @@ static void ss_video_tick(void *data, float seconds)
else
do_transition(ss, false);
return;
goto finish;
}
obs_source_media_next(ss->source);
}
finish:
pthread_mutex_unlock(&ss->mutex);
}
static inline bool ss_audio_render_(obs_source_t *transition, uint64_t *ts_out,