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

avcodec/interplayvideo: fix dead-lock

Fixes #6499.
Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 613ccdaa
......@@ -1044,7 +1044,7 @@ static void ipvideo_decode_format_10_opcodes(IpvideoContext *s, AVFrame *frame)
for (x = 0; x < s->avctx->width; x += 8) {
s->pixel_ptr = s->cur_decode_frame->data[0] + x + y * s->cur_decode_frame->linesize[0];
while (skip <= 0) {
while (skip <= 0 && bytestream2_get_bytes_left(&decoding_map_ptr) > 1) {
if (skip != -0x8000 && skip) {
opcode = bytestream2_get_le16(&decoding_map_ptr);
ipvideo_format_10_passes[pass](s, frame, opcode);
......@@ -1069,6 +1069,8 @@ static void ipvideo_decode_format_10_opcodes(IpvideoContext *s, AVFrame *frame)
changed_block = 1;
break;
}
if (bytestream2_get_bytes_left(&skip_map_ptr) < 2)
return AVERROR_INVALIDDATA;
skip = bytestream2_get_le16(&skip_map_ptr);
}
......
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