diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-10 23:45:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-24 10:39:03 +0100 |
| commit | 9e96567e14b4010d8e63186dccc89aee8784fe08 (patch) | |
| tree | 62c4e259d57ea92fb240eba16f72f7964b98d9d7 | |
| parent | 5d28b2dc3737cdd5799e0bdb3593d94f604e8fc6 (diff) | |
| download | ffmpeg-9e96567e14b4010d8e63186dccc89aee8784fe08.tar.gz | |
avcodec/dfa: Check the chunk header is not truncated
Fixes: Timeout (11sec -> 3sec)
Fixes: 13218/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DFA_fuzzer-5661074316066816
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f20760fadbc77483b9ff4b400b53ebb38ee33793)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dfa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index b8500a4995..0cb5fe933e 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -353,6 +353,8 @@ static int dfa_decode_frame(AVCodecContext *avctx, bytestream2_init(&gb, avpkt->data, avpkt->size); while (bytestream2_get_bytes_left(&gb) > 0) { + if (bytestream2_get_bytes_left(&gb) < 12) + return AVERROR_INVALIDDATA; bytestream2_skip(&gb, 4); chunk_size = bytestream2_get_le32(&gb); chunk_type = bytestream2_get_le32(&gb); |