[FFmpeg-cvslog] asfdec: check extradata size before alloc and read

Michael Niedermayer git at videolan.org
Sun Dec 2 20:49:15 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec  2 20:37:09 2012 +0100| [80aa89bdff6e3e9dd6bc58d806db0cbe99403149] | committer: Michael Niedermayer

asfdec: check extradata size before alloc and read

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

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

 libavformat/asfdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 8843901..2dcdf56 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -444,7 +444,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
         tag1 = avio_rl32(pb);
         avio_skip(pb, 20);
         if (sizeX > 40) {
-            st->codec->extradata_size = sizeX - 40;
+            st->codec->extradata_size = ffio_limit(pb, sizeX - 40);
             st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
             avio_read(pb, st->codec->extradata, st->codec->extradata_size);
         }



More information about the ffmpeg-cvslog mailing list