From: Martin Storsjö Date: Thu, 19 Sep 2013 12:58:59 +0000 (+0300) Subject: svq3: Avoid a division by zero X-Git-Tag: n2.1~57^2~228 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=601c2015bc16f0b281160292a6a760cbbbb0eacb svq3: Avoid a division by zero If the height is zero, the decompression will probably end up failing due to not fitting into the allocated buffer later anyway, so this doesn't need any more elaborate check. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 82fa632712..a345788fb5 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -980,7 +980,8 @@ 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);