[FFmpeg-cvslog] qtrle: check for invalid line offset

Laurent Aimar git at videolan.org
Fri Nov 4 20:49:22 CET 2011


ffmpeg | branch: release/0.7 | Laurent Aimar <fenrir at videolan.org> | Sat Oct  8 23:01:33 2011 +0200| [67c46b9b3027fdd9fd737e21a80d3326748b1c15] | committer: Michael Niedermayer

qtrle: check for invalid line offset

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

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

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

 libavcodec/qtrle.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 2cc2de2..0f280f5 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -464,6 +464,8 @@ static int qtrle_decode_frame(AVCodecContext *avctx,
         stream_ptr += 4;
         height = AV_RB16(&s->buf[stream_ptr]);
         stream_ptr += 4;
+        if (height > s->avctx->height - start_line)
+            goto done;
     } else {
         start_line = 0;
         height = s->avctx->height;



More information about the ffmpeg-cvslog mailing list