summaryrefslogtreecommitdiff
path: root/libavcodec/hcom.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-07 16:56:11 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-10-25 00:22:33 +0200
commit4834ec926aa569cf25c797e22643d4735880b7a1 (patch)
treee8fdcf40204758d7e82709a8d14ada9e9d0bb677 /libavcodec/hcom.c
parentb63fbc19c09d0b42da4f83c21fcf362d6ed7c545 (diff)
avcodec/hcom: Check the root entry and the right entries
Fixes: Segfault Fixes: 17991/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HCOM_fuzzer-5647235349479424 Also fixes related memleak Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hcom.c')
-rw-r--r--libavcodec/hcom.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/hcom.c b/libavcodec/hcom.c
index 0559b050c3..8300676f98 100644
--- a/libavcodec/hcom.c
+++ b/libavcodec/hcom.c
@@ -66,8 +66,15 @@ static av_cold int hcom_init(AVCodecContext *avctx)
s->dict[i].r = AV_RB16(avctx->extradata + 6 + 4 * i + 2);
if (s->dict[i].l >= 0 &&
(s->dict[i].l >= s->dict_entries ||
- s->dict[i].r >= s->dict_entries))
+ s->dict[i].r >= s->dict_entries ||
+ s->dict[i].r < 0 )) {
+ av_freep(&s->dict);
return AVERROR_INVALIDDATA;
+ }
+ }
+ if (s->dict[0].l < 0) {
+ av_freep(&s->dict);
+ return AVERROR_INVALIDDATA;
}
avctx->sample_fmt = AV_SAMPLE_FMT_U8;