diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-07-06 09:21:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:11:55 +0200 |
| commit | 941ca8fb711bb47879c7ca858396e367fe264bec (patch) | |
| tree | a82b36811b792f629aa7d914c39b35090dca3f2e | |
| parent | d68a494271c8459a16b6a67e3ca67bc57b94d9dc (diff) | |
| download | ffmpeg-941ca8fb711bb47879c7ca858396e367fe264bec.tar.gz | |
avcodec/parser: Check next index validity in ff_combine_frame()
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 15008db0fac6d97bb939fa7ef9e92d79bf1f7cb1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/parser.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 30cfc55cbc..5f78104255 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -261,6 +261,9 @@ int ff_combine_frame(ParseContext *pc, int next, for (; pc->overread > 0; pc->overread--) pc->buffer[pc->index++] = pc->buffer[pc->overread_index++]; + if (next > *buf_size) + return AVERROR(EINVAL); + /* flush remaining if EOF */ if (!*buf_size && next == END_NOT_FOUND) next = 0; |