[FFmpeg-cvslog] mtvdec: check that the buf is large enough for probing

Michael Niedermayer git at videolan.org
Thu Apr 19 22:26:00 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 19 21:46:51 2012 +0200| [ee402df9a25d1f0e15247511f524c0b7df102a27] | committer: Michael Niedermayer

mtvdec: check that the buf is large enough for probing

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

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

 libavformat/mtv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 19b7793..2f7e5fd 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -57,7 +57,7 @@ static int mtv_probe(AVProbeData *p)
         return 0;
 
     /* Check for nonzero in bpp and (width|height) header fields */
-    if(!(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
+    if(p->buf_size < 57 || !(p->buf[51] && AV_RL16(&p->buf[52]) | AV_RL16(&p->buf[54])))
         return 0;
 
     /* If width or height are 0 then imagesize header field should not */



More information about the ffmpeg-cvslog mailing list