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

avformat/ape: Error out in case of EOF in the header 

Fixes: OOM
Fixes: 24375/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6216862443241472

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 2020-07-24 23:51:11 +02:00
parent 37f5feccc6
commit a6df1fd5e9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/ape.c
View File

@ -253,7 +253,7 @@ static int ape_read_header(AVFormatContext * s)
avio_skip(pb, ape->wavheaderlength); avio_skip(pb, ape->wavheaderlength);
} }
if(!ape->totalframes){ if(!ape->totalframes || pb->eof_reached){
av_log(s, AV_LOG_ERROR, "No frames in the file!\n"); av_log(s, AV_LOG_ERROR, "No frames in the file!\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -298,8 +298,11 @@ static int ape_read_header(AVFormatContext * s)
for (i = 0; i < ape->totalframes && !pb->eof_reached; i++) for (i = 0; i < ape->totalframes && !pb->eof_reached; i++)
ape->bittable[i] = avio_r8(pb); ape->bittable[i] = avio_r8(pb);
} }
if (pb->eof_reached) if (pb->eof_reached) {
av_log(s, AV_LOG_WARNING, "File truncated\n"); av_log(s, AV_LOG_ERROR, "File truncated\n");
ret = AVERROR_INVALIDDATA;
goto fail;
}
} }
ape->frames[0].pos = ape->firstframe; ape->frames[0].pos = ape->firstframe;