jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Fix potential crash when transitioning

Browse Source 
Sometimes the A and B sources of a transition would a large difference
in their timestamps, and the calculation of where to start the audio
data for one of the sources could be above the tick size, which could
cause a crash.
This commit is contained in:
jp9000
2016-01-30 15:32:20 -08:00
parent 4b15880231
commit e93aeaef31
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/obs-source-transition.c
View File

@@ -738,6 +738,10 @@ static void process_audio(obs_source_t *transition, obs_source_t *child,
ts = child->audio_ts;
obs_source_get_audio_mix(child, &child_audio);
pos = (size_t)ns_to_audio_frames(sample_rate, ts - min_ts);
if (pos > AUDIO_OUTPUT_FRAMES)
return;
for (size_t mix_idx = 0; mix_idx < MAX_AUDIO_MIXES; mix_idx++) {
struct audio_output_data *output = &audio->output[mix_idx];
@@ -746,8 +750,6 @@ static void process_audio(obs_source_t *transition, obs_source_t *child,
if ((mixers & (1 << mix_idx)) == 0)
continue;
pos = (size_t)ns_to_audio_frames(sample_rate, ts - min_ts);
for (size_t ch = 0; ch < channels; ch++) {
float *out = output->data[ch];
float *in = input->data[ch];