generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swresample/resample: fix invert_initial_buffer() after flush

Browse Source 
Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-16 21:18:15 +02:00
parent 080c846f59
commit f6bb2cd1b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswresample/resample.c
View File

@ -399,11 +399,11 @@ static int invert_initial_buffer(ResampleContext *c, AudioData *dst, const Audio
res = num - *out_sz; res = num - *out_sz;
*out_idx = c->filter_length + (c->index >> c->phase_shift); *out_idx = c->filter_length + (c->index >> c->phase_shift);
*out_sz = 1 + c->filter_length * 2 - *out_idx; *out_sz = FFMAX(*out_sz + c->filter_length,
1 + c->filter_length * 2) - *out_idx;
c->index &= c->phase_mask; c->index &= c->phase_mask;
av_assert1(res > 0);
return res; return FFMAX(res, 0);
} }
struct Resampler const swri_resampler={ struct Resampler const swri_resampler={