[FFmpeg-cvslog] indeo3: error out if no motion vector is set.

Aneesh Dogra git at videolan.org
Mon Nov 28 01:14:16 CET 2011


ffmpeg | branch: master | Aneesh Dogra <lionaneesh at gmail.com> | Mon Nov 28 02:44:52 2011 +0530| [97980db4870675baf553dc190051161ecffa9d77] | committer: Ronald S. Bultje

indeo3: error out if no motion vector is set.

This fixes a crash on a corrupt bitstream (bugzilla #93).

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

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

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

diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 2c7e96b..e266aee 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -756,6 +756,8 @@ static int parse_bintree(Indeo3DecodeContext *ctx, AVCodecContext *avctx,
                     av_log(avctx, AV_LOG_ERROR, "SkipCell procedure not implemented yet!\n");
 
                 CHECK_CELL
+                if(!curr_cell.mv_ptr)
+                    return AVERROR_INVALIDDATA;
                 copy_cell(ctx, plane, &curr_cell);
                 return 0;
             }



More information about the ffmpeg-cvslog mailing list