diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-26 18:02:08 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-27 08:54:07 -0700 |
| commit | 98df2e24141cd00a557ef10ed7af2b956200cd80 (patch) | |
| tree | 6341f3ba3279f0548cbfe32872186630201db972 /libavcodec | |
| parent | 8e0b7e2f148d87f667fe9778b968948d0e1d4627 (diff) | |
| download | ffmpeg-98df2e24141cd00a557ef10ed7af2b956200cd80.tar.gz | |
raw: forward avpicture_fill() error code in raw_decode().
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/rawdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 6541b78c7f..ff6316aa73 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -119,6 +119,7 @@ static int raw_decode(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; RawVideoContext *context = avctx->priv_data; + int res; AVFrame *frame = data; AVPicture *picture = data; @@ -156,7 +157,9 @@ static int raw_decode(AVCodecContext *avctx, avctx->codec_tag == MKTAG('A', 'V', 'u', 'p')) buf += buf_size - context->length; - avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height); + if ((res = avpicture_fill(picture, buf, avctx->pix_fmt, + avctx->width, avctx->height)) < 0) + return res; if((avctx->pix_fmt==PIX_FMT_PAL8 && buf_size < context->length) || (av_pix_fmt_descriptors[avctx->pix_fmt].flags & PIX_FMT_PSEUDOPAL)) { frame->data[1]= context->palette; |