summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-01-27 04:57:58 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-01-27 04:58:47 (GMT)
commitf9abeecd94cfa335bf43e2a19b60fb990a46644f (patch)
treee5f8bf1366096d14be66a786687c42d5ed6d3794
parent167af704ea3df1073cf16073ae6e4ffadcb06764 (diff)
downloadffmpeg-f9abeecd94cfa335bf43e2a19b60fb990a46644f.zip
ffmpeg-f9abeecd94cfa335bf43e2a19b60fb990a46644f.tar.gz
ffmpeg-f9abeecd94cfa335bf43e2a19b60fb990a46644f.tar.bz2
swr/ build_filter: use av_calloc() fix buffer overflow
Fixes integer & buffer overflow Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libswresample/resample.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c
index 6cd2b8c..d3fe1a7 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -235,7 +235,7 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r
c->factor = factor;
c->filter_length = FFMAX((int)ceil(filter_size/factor), 1);
c->filter_alloc = FFALIGN(c->filter_length, 8);
- c->filter_bank = av_mallocz(c->filter_alloc*(phase_count+1)*c->felem_size);
+ c->filter_bank = av_calloc(c->filter_alloc, (phase_count+1)*c->felem_size);
c->filter_type = filter_type;
c->kaiser_beta = kaiser_beta;
if (!c->filter_bank)