virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ape demuxer: check for EOF in potentially long loops

Browse Source 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Anton Khirnov 2013-08-24 21:30:46 +02:00
parent a7c1689ded
commit 488b2984fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ape.c
View File

@ -283,13 +283,13 @@ static int ape_read_header(AVFormatContext * s)
ape->seektable = av_malloc(ape->seektablelength); ape->seektable = av_malloc(ape->seektablelength);
if (!ape->seektable) if (!ape->seektable)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < ape->seektablelength / sizeof(uint32_t); i++) for (i = 0; i < ape->seektablelength / sizeof(uint32_t) && !pb->eof_reached; i++)
ape->seektable[i] = avio_rl32(pb); ape->seektable[i] = avio_rl32(pb);
if (ape->fileversion < 3810) { if (ape->fileversion < 3810) {
ape->bittable = av_malloc(ape->totalframes); ape->bittable = av_malloc(ape->totalframes);
if (!ape->bittable) if (!ape->bittable)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < ape->totalframes; i++) for (i = 0; i < ape->totalframes && !pb->eof_reached; i++)
ape->bittable[i] = avio_r8(pb); ape->bittable[i] = avio_r8(pb);
} }
} }