Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-06-28 17:59:59 +0300
committerPaul B Mahol <onemda@gmail.com>2017-06-28 18:02:07 +0300
commit42f516b5d356a1fe9945dfe770a4f62ce62f3080 (patch)
tree4ac4cb4763a27645f0510ff5c38546f38d6e46ff /libavcodec/interplayvideo.c
parent3426832ac3074e081923095f7794064a30642841 (diff)
avcodec/interplayvideo: check that video_size is >0
Fixes #6498. Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/interplayvideo.c')
-rw-r--r--libavcodec/interplayvideo.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 2ac2f991a6..04cc91a060 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -1233,6 +1233,8 @@ static int ipvideo_decode_frame(AVCodecContext *avctx,
s->decoding_map_size = ((s->avctx->width / 8) * (s->avctx->height / 8)) * 2;
s->decoding_map = buf + 8 + 14; /* 14 bits of op data */
video_data_size -= s->decoding_map_size + 14;
+ if (video_data_size <= 0)
+ return AVERROR_INVALIDDATA;
if (buf_size < 8 + s->decoding_map_size + 14 + video_data_size)
return AVERROR_INVALIDDATA;