highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not attempt to decode APE file with no frames.

Browse Source 
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
This commit is contained in:
Kostya Shishkov 2011-03-15 20:37:37 +01:00 committed by Carl Eugen Hoyos
parent 6947b0c42e
commit 1c31b26bdf
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ape.c
View File

@ -242,6 +242,10 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
avio_seek(pb, ape->wavheaderlength, SEEK_CUR); avio_seek(pb, ape->wavheaderlength, SEEK_CUR);
} }
if(!ape->totalframes){
av_log(s, AV_LOG_ERROR, "No frames in the file!\n");
return AVERROR(EINVAL);
}
if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){ if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){
av_log(s, AV_LOG_ERROR, "Too many frames: %d\n", ape->totalframes); av_log(s, AV_LOG_ERROR, "Too many frames: %d\n", ape->totalframes);
return -1; return -1;