highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sgi: Correctly propagate meaningful error values

Browse Source
This commit is contained in:
Vittorio Giovara 2015-11-23 18:56:09 -05:00
parent 823fa70045
commit 99cb833fc2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/sgidec.c
View File

@ -229,13 +229,13 @@ static int decode_frame(AVCodecContext *avctx,
if (s->bytes_per_channel != 1 && s->bytes_per_channel != 2) { if (s->bytes_per_channel != 1 && s->bytes_per_channel != 2) {
av_log(avctx, AV_LOG_ERROR, "wrong channel number\n"); av_log(avctx, AV_LOG_ERROR, "wrong channel number\n");
return -1; return AVERROR(EINVAL);
} }
/* Check for supported image dimensions. */ /* Check for supported image dimensions. */
if (dimension != 2 && dimension != 3) { if (dimension != 2 && dimension != 3) {
av_log(avctx, AV_LOG_ERROR, "wrong dimension number\n"); av_log(avctx, AV_LOG_ERROR, "wrong dimension number\n");
return -1; return AVERROR(EINVAL);
} }
if (s->depth == SGI_GRAYSCALE) { if (s->depth == SGI_GRAYSCALE) {
@ -246,16 +246,17 @@ static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGBA64BE : AV_PIX_FMT_RGBA; avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGBA64BE : AV_PIX_FMT_RGBA;
} else { } else {
av_log(avctx, AV_LOG_ERROR, "wrong picture format\n"); av_log(avctx, AV_LOG_ERROR, "wrong picture format\n");
return -1; return AVERROR(EINVAL);
} }
ret = ff_set_dimensions(avctx, s->width, s->height); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ff_get_buffer(avctx, p, 0) < 0) { ret = ff_get_buffer(avctx, p, 0);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n");
return -1; return ret;
} }
p->pict_type = AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;

4
libavcodec/sgienc.c
View File

@ -193,7 +193,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
/* Make an intermediate consecutive buffer. */ /* Make an intermediate consecutive buffer. */
if (!(encode_buf = av_malloc(width * bytes_per_channel))) if (!(encode_buf = av_malloc(width * bytes_per_channel)))
return -1; return AVERROR(ENOMEM);
for (z = 0; z < depth; z++) { for (z = 0; z < depth; z++) {
in_buf = p->data[0] + p->linesize[0] * (height - 1) + z * bytes_per_channel; in_buf = p->data[0] + p->linesize[0] * (height - 1) + z * bytes_per_channel;
@ -208,7 +208,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
bytes_per_channel); bytes_per_channel);
if (length < 1) { if (length < 1) {
av_free(encode_buf); av_free(encode_buf);
return -1; return AVERROR_INVALIDDATA;
} }
bytestream2_put_be32(&tablen_pcb, length); bytestream2_put_be32(&tablen_pcb, length);