[SCM] libav/experimental: Check dimensions to avoid division by zero due to invalid new dimensions. Partially fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=773.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:57:33 UTC 2013


The following commit has been merged in the experimental branch:
commit 284ad8a4f06087f3df94d6473774a01a8bececb5
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun Mar 11 09:16:11 2007 +0000

    Check dimensions to avoid division by zero due to invalid new dimensions.
    Partially fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=773.
    
    Originally committed as revision 8321 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index af438a3..e1e8287 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -454,6 +454,8 @@ static int rv20_decode_picture_header(MpegEncContext *s)
         }
         if(new_w != s->width || new_h != s->height){
             av_log(s->avctx, AV_LOG_DEBUG, "attempting to change resolution to %dx%d\n", new_w, new_h);
+            if (avcodec_check_dimensions(s->avctx, new_h, new_w) < 0)
+                return -1;
             MPV_common_end(s);
             s->width  = s->avctx->width = new_w;
             s->height = s->avctx->height= new_h;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list