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

Merge pull request #1428 from pantherrui/master

Browse source 
fix heap corruption when video capture thread release the frame before it push into source->async_frames.
This commit is contained in:
Jim 2018-09-17 05:19:58 -07:00 committed by GitHub
parent 8435e581ac 26d3f42b89
commit 31561b3231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libobs/obs-source.c
View file

@ -2346,7 +2346,7 @@ static void clean_cache(obs_source_t *source)
}
#define MAX_ASYNC_FRAMES 30
//if return value is not null then do (os_atomic_dec_long(&output->refs) == 0) && obs_source_frame_destroy(output)
static inline struct obs_source_frame *cache_video(struct obs_source *source,
const struct obs_source_frame *frame)
{
@ -2403,11 +2403,6 @@ static inline struct obs_source_frame *cache_video(struct obs_source *source,
copy_frame_data(new_frame, frame);
if (os_atomic_dec_long(&new_frame->refs) == 0) {
obs_source_frame_destroy(new_frame);
new_frame = NULL;
}
return new_frame;
}
@ -2426,13 +2421,17 @@ void obs_source_output_video(obs_source_t *source,
cache_video(source, frame) : NULL;
/* ------------------------------------------- */
pthread_mutex_lock(&source->async_mutex);
if (output) {
pthread_mutex_lock(&source->async_mutex);
da_push_back(source->async_frames, &output);
pthread_mutex_unlock(&source->async_mutex);
source->async_active = true;
if (os_atomic_dec_long(&output->refs) == 0) {
obs_source_frame_destroy(output);
output = NULL;
} else {
da_push_back(source->async_frames, &output);
source->async_active = true;
}
}
pthread_mutex_unlock(&source->async_mutex);
}
static inline bool preload_frame_changed(obs_source_t *source,