From f6bb2cd1b048a9169827368241769a2a7887efdd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 16 Oct 2014 21:18:15 +0200 Subject: swresample/resample: fix invert_initial_buffer() after flush Fixes: asan_heap-uaf_2071250_7_139.ogg Fixes: assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libswresample/resample.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libswresample') diff --git a/libswresample/resample.c b/libswresample/resample.c index 2a8aa7e2d0..d0f6e20788 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -399,11 +399,11 @@ static int invert_initial_buffer(ResampleContext *c, AudioData *dst, const Audio res = num - *out_sz; *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; - av_assert1(res > 0); - return res; + return FFMAX(res, 0); } struct Resampler const swri_resampler={ -- cgit v1.2.3