[FFmpeg-cvslog] svq3: check the watermark height.

Michael Niedermayer git at videolan.org
Mon Apr 16 18:40:55 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 16 18:26:49 2012 +0200| [4fa706a4a64f9e06b08c1a42a62893ff2f7de82f] | committer: Michael Niedermayer

svq3: check the watermark height.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 3118771..c35138b 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -906,7 +906,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
                 int offset = (get_bits_count(&gb)+7)>>3;
                 uint8_t *buf;
 
-                if ((uint64_t)watermark_width*4 > UINT_MAX/watermark_height)
+                if (watermark_height<=0 || (uint64_t)watermark_width*4 > UINT_MAX/watermark_height)
                     return -1;
 
                 buf = av_malloc(buf_len);



More information about the ffmpeg-cvslog mailing list