RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

soxdec: use meaningful error codes 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-12-28 21:50:42 +00:00
parent 09401694db
commit a4b62f36c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/soxdec.c
View File

@ -75,12 +75,12 @@ static int sox_read_header(AVFormatContext *s)
if (comment_size > 0xFFFFFFFFU - SOX_FIXED_HDR - 4U) { if (comment_size > 0xFFFFFFFFU - SOX_FIXED_HDR - 4U) {
av_log(s, AV_LOG_ERROR, "invalid comment size (%u)\n", comment_size); av_log(s, AV_LOG_ERROR, "invalid comment size (%u)\n", comment_size);
return -1; return AVERROR_INVALIDDATA;
} }
if (sample_rate <= 0 || sample_rate > INT_MAX) { if (sample_rate <= 0 || sample_rate > INT_MAX) {
av_log(s, AV_LOG_ERROR, "invalid sample rate (%f)\n", sample_rate); av_log(s, AV_LOG_ERROR, "invalid sample rate (%f)\n", sample_rate);
return -1; return AVERROR_INVALIDDATA;
} }
sample_rate_frac = sample_rate - floor(sample_rate); sample_rate_frac = sample_rate - floor(sample_rate);
@ -92,7 +92,7 @@ static int sox_read_header(AVFormatContext *s)
if ((header_size + 4) & 7 || header_size < SOX_FIXED_HDR + comment_size if ((header_size + 4) & 7 || header_size < SOX_FIXED_HDR + comment_size
|| st->codec->channels > 65535) /* Reserve top 16 bits */ { || st->codec->channels > 65535) /* Reserve top 16 bits */ {
av_log(s, AV_LOG_ERROR, "invalid header\n"); av_log(s, AV_LOG_ERROR, "invalid header\n");
return -1; return AVERROR_INVALIDDATA;
} }
if (comment_size && comment_size < UINT_MAX) { if (comment_size && comment_size < UINT_MAX) {