diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-06-14 13:10:14 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-06-16 00:30:05 +0200 |
| commit | 6808759a58421b90526832ec198d61f1ccaaf765 (patch) | |
| tree | 587a7a8ca507a99be4f045f28a08d77c84b0d049 | |
| parent | 3cc1a8988112896e302c96f9df8839d983677891 (diff) | |
| download | ffmpeg-6808759a58421b90526832ec198d61f1ccaaf765.tar.gz | |
lavc/rawdec: fix various bogus error codes and add some logs
Help debugging.
| -rw-r--r-- | libavcodec/rawdec.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index dd4355f468..4c850f551c 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -109,7 +109,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) context->length = avpicture_get_size(avctx->pix_fmt, FFALIGN(avctx->width, 16), avctx->height); context->buffer = av_malloc(context->length); if (!context->buffer) - return -1; + return AVERROR(ENOMEM); } else { context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); } @@ -139,7 +139,7 @@ static int raw_decode(AVCodecContext *avctx, int buf_size = avpkt->size; int linesize_align = 4; RawVideoContext *context = avctx->priv_data; - int res; + int res, len; AVFrame *frame = data; AVPicture *picture = data; @@ -188,8 +188,11 @@ static int raw_decode(AVCodecContext *avctx, avctx->codec_tag == MKTAG('A', 'V', 'u', 'p')) buf += buf_size - context->length; - if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0)) - return -1; + len = context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0); + if (buf_size < len) { + av_log(avctx, AV_LOG_ERROR, "Invalid buffer size, packet size %d < expected length %d\n", buf_size, len); + return AVERROR(EINVAL); + } if ((res = avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height)) < 0) |