diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-07-06 11:51:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-11 20:18:46 +0100 |
| commit | ddda370a9780b4d4c88e59bfe4ddb2de27902ebd (patch) | |
| tree | 068c79d462780a873f02f462ed71f0bdc6e0730b /libavcodec/dnxhd_parser.c | |
| parent | 2e20f02df4ec7296113ed76a9139c8cd88b7dfa3 (diff) | |
| download | ffmpeg-ddda370a9780b4d4c88e59bfe4ddb2de27902ebd.tar.gz | |
avcodec/dnxhd_parser: Fix parser when input does not have nicely sized packets
Fixes: out of array access
Fixes: 15522/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DNXHD_fuzzer-5747756078989312
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 2d900d8fe0aaf9c984e024956eb537ecdfe2c949)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dnxhd_parser.c')
| -rw-r--r-- | libavcodec/dnxhd_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 154a858476..3cc005ab84 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -79,8 +79,9 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, if (remaining <= 0) continue; } + remaining += i - 47; dctx->remaining = remaining; - if (buf_size - i + 47 >= dctx->remaining) { + if (buf_size >= dctx->remaining) { pc->frame_start_found = 0; pc->state64 = -1; dctx->cur_byte = 0; |