aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-13 23:13:38 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-13 23:15:13 +0200
commite3e51f8c14d22ae11684dcfe58df355f0f9e6401 (patch)
treef1f11c482fba53f7d52fce2b1bd89ae3e1389ce7
parent9351a156de724edb69ba6e1f05884fe806a13a21 (diff)
downloadffmpeg-e3e51f8c14d22ae11684dcfe58df355f0f9e6401.tar.gz
avcodec/mlpdec: Check that there is enough data for headers
Fixes: out of array access Fixes: 1541/clusterfuzz-testcase-minimized-6403410590957568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mlpdec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index b471f0d760..fa4347fb23 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -1162,6 +1162,11 @@ static int read_access_unit(AVCodecContext *avctx, void* data,
substr_header_size += 2;
}
+ if (length < header_size + substr_header_size) {
+ av_log(m->avctx, AV_LOG_ERROR, "Insuffient data for headers\n");
+ goto error;
+ }
+
if (!(nonrestart_substr ^ m->is_major_sync_unit)) {
av_log(m->avctx, AV_LOG_ERROR, "Invalid nonrestart_substr.\n");
goto error;