[FFmpeg-cvslog] vcr1dec: Check that there is sufficient input data.

Michael Niedermayer git at videolan.org
Wed Dec 28 19:21:51 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 28 19:05:16 2011 +0100| [8e09482e4d27d65bbce2ce5c2f4392216011ed09] | committer: Michael Niedermayer

vcr1dec: Check that there is sufficient input data.
Fixes crash.

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

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

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

diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 73a7226..1526215 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -56,6 +56,11 @@ static int decode_frame(AVCodecContext *avctx,
     if(p->data[0])
         avctx->release_buffer(avctx, p);
 
+    if(buf_size < 16 + avctx->height + avctx->width*avctx->height*5/8){
+        av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n");
+        return AVERROR(EINVAL);
+    }
+
     p->reference= 0;
     if(avctx->get_buffer(avctx, p) < 0){
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");



More information about the ffmpeg-cvslog mailing list