[FFmpeg-cvslog] indeo3: fix null pointer dereference in vulnerable.mov

Michael Niedermayer git at videolan.org
Thu Nov 24 22:48:10 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 24 22:39:23 2011 +0100| [e421b79d01a3bf18d1ff8d8c4639669b66d788a5] | committer: Michael Niedermayer

indeo3: fix null pointer dereference in vulnerable.mov

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

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

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

diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index a5146e8..22984db 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -226,8 +226,11 @@ static void copy_cell(Indeo3DecodeContext *ctx, Plane *plane, Cell *cell)
     /* setup output and reference pointers */
     offset_dst  = (cell->ypos << 2) * plane->pitch + (cell->xpos << 2);
     dst         = plane->pixels[ctx->buf_sel] + offset_dst;
+    if(cell->mv_ptr){
     mv_y        = cell->mv_ptr[0];
     mv_x        = cell->mv_ptr[1];
+    }else
+        mv_x= mv_y= 0;
     offset      = offset_dst + mv_y * plane->pitch + mv_x;
     src         = plane->pixels[ctx->buf_sel ^ 1] + offset;
 



More information about the ffmpeg-cvslog mailing list