diff options
| author | Michael Niedermayer <[email protected]> | 2019-07-13 20:08:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2019-08-04 21:16:28 +0200 |
| commit | 4f57240859fbcfb4de4303c7643776bb1b566c46 (patch) | |
| tree | b5f2dcba4dc1f91dda07b365b991f2fc178d4d6a | |
| parent | 44119e5ad6ca560ca6a1d35d250ad06604467145 (diff) | |
avformat/vividas: Check if extradata was read successfully
Fixes: OOM
Fixes: 15575/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5654666781655040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 8e41675e18682ee14a64acf6139d72d22ce669b6)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/vividas.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 830e318645..c0d39f0a6f 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -386,7 +386,12 @@ static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t offset += av_xiphlacing(&p[offset], data_len[j]); for (j = 0; j < num_data; j++) { - avio_read(pb, &p[offset], data_len[j]); + int ret = avio_read(pb, &p[offset], data_len[j]); + if (ret < data_len[j]) { + st->codecpar->extradata_size = 0; + av_freep(&st->codecpar->extradata); + break; + } offset += data_len[j]; } |