Commit e4fff08f authored by Paul B Mahol's avatar Paul B Mahol

exr: fix decoding ZIP16 and height not multiple of 16

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 2d5c80b2
......@@ -543,6 +543,8 @@ static int decode_frame(AVCodecContext *avctx,
} else {
const uint8_t *red_channel_buffer, *green_channel_buffer, *blue_channel_buffer, *alpha_channel_buffer = 0;
if (scan_lines_per_block > 1)
uncompressed_size = scan_line_size * FFMIN(scan_lines_per_block, ymax - y + 1);
if ((s->compr == EXR_ZIP1 || s->compr == EXR_ZIP16) && data_size < uncompressed_size) {
unsigned long dest_len = uncompressed_size;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment