From e124c3c298a7abe2ded2b90817915c5baf8ea1be Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 27 Oct 2011 14:31:53 +0200 Subject: [PATCH] resample: Fix overflow Found-by: Jim Radford Signed-off-by: Michael Niedermayer (cherry picked from commit 6ae93d030476ddd7fa2ab4d9d2dd25df85725390) Signed-off-by: Michael Niedermayer --- libavcodec/resample2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c index ac9db73c8c..01478190a3 100644 --- a/libavcodec/resample2.c +++ b/libavcodec/resample2.c @@ -190,8 +190,10 @@ AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, memcpy(&c->filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM)); c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1]; - c->src_incr= out_rate; - c->ideal_dst_incr= c->dst_incr= in_rate * phase_count; + if(!av_reduce(&c->src_incr, &c->dst_incr, out_rate, in_rate * (int64_t)phase_count, INT32_MAX/2)) + return NULL; + c->ideal_dst_incr= c->dst_incr; + c->index= -phase_count*((c->filter_length-1)/2); return c;