avcodec/mpegvideo: check that linesize is not too small

[ffmpeg] / libswresample / resample.c

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 0fef28373b3992f17a52161586e25f2e44597581..af76aa248316d32e56509390a69eddda9e430ffd 100644 (file)
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -335,6 +335,11 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
     int i, ret= -1;
     int av_unused mm_flags = av_get_cpu_flags();
     int need_emms= 0;
+    int64_t max_src_size = (INT64_MAX >> (c->phase_shift+1)) / c->src_incr;
+
+    if (c->compensation_distance)
+        dst_size = FFMIN(dst_size, c->compensation_distance);
+    src_size = FFMIN(src_size, max_src_size);
 
     for(i=0; i<dst->ch_count; i++){
 #if HAVE_MMXEXT_INLINE
@@ -366,6 +371,13 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
     }
     if(need_emms)
         emms_c();
+
+    if (c->compensation_distance) {
+        c->compensation_distance -= ret;
+        if (!c->compensation_distance)
+            c->dst_incr = c->ideal_dst_incr / c->src_incr;
+    }
+
     return ret;
 }