aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-20 01:23:01 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-20 01:24:11 +0200
commit64ea4d102a070b95832ae4a751688f87da7760a2 (patch)
tree5250a84dc3971a354d5ce24dfa73b97ef80c9f76
parent0cc6dd1b817bc4510714dd99122625d93909290a (diff)
downloadffmpeg-64ea4d102a070b95832ae4a751688f87da7760a2.tar.gz
avcodec/mlpdec: Do not leave a invalid num_primitive_matrices in the context
Fixes: runtime error: index 8 out of bounds for type 'uint8_t [8]' Fixes: 1699/clusterfuzz-testcase-minimized-6327177438035968 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 5426712007..eac19a0d5e 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -729,6 +729,7 @@ static int read_matrix_params(MLPDecodeContext *m, unsigned int substr, GetBitCo
av_log(m->avctx, AV_LOG_ERROR,
"Number of primitive matrices cannot be greater than %d.\n",
max_primitive_matrices);
+ s->num_primitive_matrices = 0;
return AVERROR_INVALIDDATA;
}