From afbc4d2dac0434f645bbce80d5a47e11e4d6d5fb Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Fri, 13 Aug 2010 20:06:18 +0000
Subject: Prevent overflow on random input.

Originally committed as revision 24795 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/rtpdec_asf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libavformat/rtpdec_asf.c')

diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index 56df314850..db872ce398 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -230,7 +230,8 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
                 int prev_len = out_len;
                 out_len += cur_len;
                 asf->buf = av_realloc(asf->buf, out_len);
-                memcpy(asf->buf + prev_len, buf + off, cur_len);
+                memcpy(asf->buf + prev_len, buf + off,
+                       FFMIN(cur_len, len - off));
                 url_fskip(pb, cur_len);
             }
         }
-- 
cgit v1.2.3