ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sat Jul 13 20:08:03 2019 +0200| [7d74b36f157723a3885e956b707af64597663ee5] | committer: Michael Niedermayer
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 <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d74b36f157723a3885e956b707af64597663ee5 --- libavformat/vividas.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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]; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
