aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-16 18:26:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-16 18:36:40 +0200
commit4fa706a4a64f9e06b08c1a42a62893ff2f7de82f (patch)
treedb07db9a6d215e7051552641d228a21e087c3537 /libavcodec
parentefe1ba7201b3bb609d3a41091e15e875137f3f32 (diff)
downloadffmpeg-4fa706a4a64f9e06b08c1a42a62893ff2f7de82f.tar.gz
svq3: check the watermark height.
Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/svq3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 31187713da..c35138b8bc 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);