diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 21:59:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 22:05:55 +0200 |
| commit | 3539d6c63a16e1b2874bb037a86f317449c58770 (patch) | |
| tree | 0d0869ac7940ef216b26c65fed6be4d00c716e90 /libavcodec | |
| parent | 9bcdb98839f3d883867d87c6425e67ed7bcc7149 (diff) | |
| download | ffmpeg-3539d6c63a16e1b2874bb037a86f317449c58770.tar.gz | |
avcodec/iff: check pixfmt for rgb8 / rgbn
Fixes out of array access
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/iff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 00f5261662..ce06b365fc 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -849,9 +849,9 @@ static int decode_frame(AVCodecContext *avctx, break; case 4: bytestream2_init(&gb, buf, buf_size); - if (avctx->codec_tag == MKTAG('R', 'G', 'B', '8')) + if (avctx->codec_tag == MKTAG('R', 'G', 'B', '8') && avctx->pix_fmt == AV_PIX_FMT_RGB32) decode_rgb8(&gb, s->frame->data[0], avctx->width, avctx->height, s->frame->linesize[0]); - else if (avctx->codec_tag == MKTAG('R', 'G', 'B', 'N')) + else if (avctx->codec_tag == MKTAG('R', 'G', 'B', 'N') && avctx->pix_fmt == AV_PIX_FMT_RGB444) decode_rgbn(&gb, s->frame->data[0], avctx->width, avctx->height, s->frame->linesize[0]); else return unsupported(avctx); |