[FFmpeg-cvslog] swresample/resample: Limit filter length

Michael Niedermayer git at videolan.org
Mon Jun 23 17:55:50 CEST 2014


ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  8 00:19:07 2014 +0200| [37f854f5b958486c2ca215cd54b60728d94e224f] | committer: Michael Niedermayer

swresample/resample: Limit filter length

Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f9158b01d0f3effb58e87fb07db0382bc1e47de5)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37f854f5b958486c2ca215cd54b60728d94e224f
---

 libswresample/resample.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 8b1b6ca..b968447 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -229,6 +229,11 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r
             av_assert0(0);
         }
 
+        if (filter_size/factor > INT32_MAX/256) {
+            av_log(NULL, AV_LOG_ERROR, "Filter length too large\n");
+            goto error;
+        }
+
         c->phase_shift   = phase_shift;
         c->phase_mask    = phase_count - 1;
         c->linear        = linear;



More information about the ffmpeg-cvslog mailing list