diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:29:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 13:29:39 +0200 |
| commit | c092af30088e42c2333ef0953f9dd2fdf76d3dee (patch) | |
| tree | bad2d14019fd3868368abe3161a159c082fca0bb /libavcodec/svq3.c | |
| parent | 61a8eaf7119db509cbfc0b8c123f5c6baad78a32 (diff) | |
| parent | 601c2015bc16f0b281160292a6a760cbbbb0eacb (diff) | |
| download | ffmpeg-c092af30088e42c2333ef0953f9dd2fdf76d3dee.tar.gz | |
Merge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'
* commit '601c2015bc16f0b281160292a6a760cbbbb0eacb':
svq3: Avoid a division by zero
Conflicts:
libavcodec/svq3.c
See: 4fa706a4a64f9e06b08c1a42a62893ff2f7de82f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 9499422f91..9326165c36 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -986,7 +986,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) int offset = get_bits_count(&gb) + 7 >> 3; uint8_t *buf; - if (watermark_height <= 0 || (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); |