Merge commit '9925f7df0a50387ade8d83cb85b40c53e41e7041' into release/0.10
[ffmpeg.git] / libavcodec / svq3.c
index 6f5a2a9..c9fb6c9 100644 (file)
@@ -905,7 +905,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);