generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf/apedec: return meaningful error codes

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-12-06 17:17:49 +00:00
parent 4d1912ff4d
commit 7510a9a466
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/ape.c
View File

@ -165,14 +165,14 @@ static int ape_read_header(AVFormatContext * s)
tag = avio_rl32(pb); tag = avio_rl32(pb);
if (tag != MKTAG('M', 'A', 'C', ' ')) if (tag != MKTAG('M', 'A', 'C', ' '))
return -1; return AVERROR_INVALIDDATA;
ape->fileversion = avio_rl16(pb); ape->fileversion = avio_rl16(pb);
if (ape->fileversion < APE_MIN_VERSION || ape->fileversion > APE_MAX_VERSION) { if (ape->fileversion < APE_MIN_VERSION || ape->fileversion > APE_MAX_VERSION) {
av_log(s, AV_LOG_ERROR, "Unsupported file version - %d.%02d\n", av_log(s, AV_LOG_ERROR, "Unsupported file version - %d.%02d\n",
ape->fileversion / 1000, (ape->fileversion % 1000) / 10); ape->fileversion / 1000, (ape->fileversion % 1000) / 10);
return -1; return AVERROR_PATCHWELCOME;
} }
if (ape->fileversion >= 3980) { if (ape->fileversion >= 3980) {
@ -251,7 +251,7 @@ static int ape_read_header(AVFormatContext * s)
if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){ if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){
av_log(s, AV_LOG_ERROR, "Too many frames: %"PRIu32"\n", av_log(s, AV_LOG_ERROR, "Too many frames: %"PRIu32"\n",
ape->totalframes); ape->totalframes);
return -1; return AVERROR_INVALIDDATA;
} }
if (ape->seektablelength && (ape->seektablelength / sizeof(*ape->seektable)) < ape->totalframes) { if (ape->seektablelength && (ape->seektablelength / sizeof(*ape->seektable)) < ape->totalframes) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
@ -278,7 +278,7 @@ static int ape_read_header(AVFormatContext * s)
ape->seektable[i] = avio_rl32(pb); ape->seektable[i] = avio_rl32(pb);
}else{ }else{
av_log(s, AV_LOG_ERROR, "Missing seektable\n"); av_log(s, AV_LOG_ERROR, "Missing seektable\n");
return -1; return AVERROR_INVALIDDATA;
} }
ape->frames[0].pos = ape->firstframe; ape->frames[0].pos = ape->firstframe;
@ -320,7 +320,7 @@ static int ape_read_header(AVFormatContext * s)
/* now we are ready: build format streams */ /* now we are ready: build format streams */
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return -1; return AVERROR(ENOMEM);
total_blocks = (ape->totalframes == 0) ? 0 : ((ape->totalframes - 1) * ape->blocksperframe) + ape->finalframeblocks; total_blocks = (ape->totalframes == 0) ? 0 : ((ape->totalframes - 1) * ape->blocksperframe) + ape->finalframeblocks;