ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Sun Aug
10 21:59:33 2014 +0200| [5865d599c38850b2a1fd33fe197eb8fcc6c970a4] | committer:
Michael Niedermayer
avcodec/iff: check pixfmt for rgb8 / rgbn
Fixes out of array access
Found-by: Piotr Bandurski <ami_st...@o2.pl>
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 3539d6c63a16e1b2874bb037a86f317449c58770)
Conflicts:
libavcodec/iff.c
(cherry picked from commit 656f930160db48e0b7b25069c62abc340e7f0628)
Conflicts:
libavcodec/iff.c
(cherry picked from commit abc1fa7c5a1dca1345b9471b81cfcda00c56220d)
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5865d599c38850b2a1fd33fe197eb8fcc6c970a4
---
libavcodec/iff.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index bebf6a5..37b7f25 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -832,9 +832,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);
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
