Skip to content

F
ffmpeg.wasm-core
Commit feab761b authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

avcodec/interplayvideo: properly check if there is enough bytes left 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent c4cbaec6
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
libavcodec/interplayvideo.c
View file @ feab761b
...@@ -1233,6 +1233,10 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, ...@@ -1233,6 +1233,10 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
s->decoding_map_size = ((s->avctx->width / 8) * (s->avctx->height / 8)) * 2; s->decoding_map_size = ((s->avctx->width / 8) * (s->avctx->height / 8)) * 2;
s->decoding_map = buf + 8 + 14; /* 14 bits of op data */ s->decoding_map = buf + 8 + 14; /* 14 bits of op data */
video_data_size -= s->decoding_map_size + 14; video_data_size -= s->decoding_map_size + 14;
if (buf_size < 8 + s->decoding_map_size + 14 + video_data_size)
return AVERROR_INVALIDDATA;
bytestream2_init(&s->stream_ptr, buf + 8 + s->decoding_map_size + 14, video_data_size); bytestream2_init(&s->stream_ptr, buf + 8 + s->decoding_map_size + 14, video_data_size);
break; break;
...@@ -1253,6 +1257,9 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, ...@@ -1253,6 +1257,9 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (buf_size < 8 + video_data_size + s->decoding_map_size + s->skip_map_size)
return AVERROR_INVALIDDATA;
bytestream2_init(&s->stream_ptr, buf + 8, video_data_size); bytestream2_init(&s->stream_ptr, buf + 8, video_data_size);
s->decoding_map = buf + 8 + video_data_size; s->decoding_map = buf + 8 + video_data_size;
s->skip_map = buf + 8 + video_data_size + s->decoding_map_size; s->skip_map = buf + 8 + video_data_size + s->decoding_map_size;
...@@ -1270,6 +1277,9 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, ...@@ -1270,6 +1277,9 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (buf_size < 8 + video_data_size + s->decoding_map_size)
return AVERROR_INVALIDDATA;
bytestream2_init(&s->stream_ptr, buf + 8, video_data_size); bytestream2_init(&s->stream_ptr, buf + 8, video_data_size);
s->decoding_map = buf + 8 + video_data_size; s->decoding_map = buf + 8 + video_data_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