RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-07-13 20:08:03 +02:00
parent 1cf2f040e3
commit 8e41675e18
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/vividas.c
View File

@ -386,7 +386,12 @@ static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t
offset += av_xiphlacing(&p[offset], data_len[j]); offset += av_xiphlacing(&p[offset], data_len[j]);
for (j = 0; j < num_data; 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]; offset += data_len[j];
} }