diff options
| author | Kostya <kostya.shishkov@gmail.com> | 2011-03-15 09:19:43 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-03-18 17:02:34 +0100 |
| commit | f9bf2a4ab10a0718a11d43fecba75bb40aac6628 (patch) | |
| tree | 1900bf258165588dbb3b59b81c948b711b19c40d | |
| parent | cf69619141a5742c4e4156177335d553c5bab7b6 (diff) | |
| download | ffmpeg-f9bf2a4ab10a0718a11d43fecba75bb40aac6628.tar.gz | |
Do not attempt to decode APE file with no frames
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
(cherry picked from commit 8312e3fc9041027a33c8bc667bb99740fdf41dd5)
| -rw-r--r-- | libavformat/ape.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c index 91acf7240d..0ebc307668 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -242,6 +242,10 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap) url_fskip(pb, ape->wavheaderlength); } + 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)){ av_log(s, AV_LOG_ERROR, "Too many frames: %d\n", ape->totalframes); return -1; |