RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 21:42:09 +00:00
Code Issues Projects Releases Wiki Activity

oma: return meaningful errors

Browse Source
This commit is contained in:
Luca Barbato 2013-04-17 11:41:54 +02:00
parent e55e8b2c36
commit 6f98508e2b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/omadec.c
View File

@ -200,13 +200,13 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
} }
if (!em) { if (!em) {
av_log(s, AV_LOG_ERROR, "No encryption header found\n"); av_log(s, AV_LOG_ERROR, "No encryption header found\n");
return -1; return AVERROR_INVALIDDATA;
} }
if (geob->datasize < 64) { if (geob->datasize < 64) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Invalid GEOB data size: %u\n", geob->datasize); "Invalid GEOB data size: %u\n", geob->datasize);
return -1; return AVERROR_INVALIDDATA;
} }
gdata = geob->data; gdata = geob->data;
@ -221,7 +221,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
if (memcmp(&gdata[OMA_ENC_HEADER_SIZE], "KEYRING ", 12)) { if (memcmp(&gdata[OMA_ENC_HEADER_SIZE], "KEYRING ", 12)) {
av_log(s, AV_LOG_ERROR, "Invalid encryption header\n"); av_log(s, AV_LOG_ERROR, "Invalid encryption header\n");
return -1; return AVERROR_INVALIDDATA;
} }
oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]); oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]);
av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid); av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid);
@ -251,7 +251,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
} }
if (i >= sizeof(leaf_table)) { if (i >= sizeof(leaf_table)) {
av_log(s, AV_LOG_ERROR, "Invalid key\n"); av_log(s, AV_LOG_ERROR, "Invalid key\n");
return -1; return AVERROR_INVALIDDATA;
} }
} }
@ -286,7 +286,7 @@ static int oma_read_header(AVFormatContext *s)
if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}), 3) || if (memcmp(buf, ((const uint8_t[]){'E', 'A', '3'}), 3) ||
buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) { buf[4] != 0 || buf[5] != EA3_HEADER_SIZE) {
av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n"); av_log(s, AV_LOG_ERROR, "Couldn't find the EA3 header !\n");
return -1; return AVERROR_INVALIDDATA;
} }
oc->content_start = avio_tell(s->pb); oc->content_start = avio_tell(s->pb);
@ -380,7 +380,7 @@ static int oma_read_header(AVFormatContext *s)
break; break;
default: default:
av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n", buf[32]); av_log(s, AV_LOG_ERROR, "Unsupported codec %d!\n", buf[32]);
return -1; return AVERROR(ENOSYS);
} }
st->codec->block_align = framesize; st->codec->block_align = framesize;