ffmpeg | branch: release/0.10 | Michael Niedermayer <michae...@gmx.at> | Fri
Oct 3 17:35:58 2014 +0200| [7238c744de4254973d3b04550c5764fd6bfc8267] |
committer: Michael Niedermayer
avcodec/pngdec: Check bits per pixel before setting monoblack pixel format
Fixes out of array accesses
Fixes: asan_heap-oob_14dbfcf_4_asan_heap-oob_1ce5767_179_add_method_small.png
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 3e2b745020c2dbf0201fe7df3dad9e7e0b2e1bb6)
Conflicts:
libavcodec/pngdec.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7238c744de4254973d3b04550c5764fd6bfc8267
---
libavcodec/pngdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 1edef54..80631f7 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -486,7 +486,7 @@ static int decode_frame(AVCodecContext *avctx,
} else if ((s->bits_per_pixel == 1 || s->bits_per_pixel == 2
|| s->bits_per_pixel == 4 || s->bits_per_pixel == 8) &&
s->color_type == PNG_COLOR_TYPE_PALETTE) {
avctx->pix_fmt = PIX_FMT_PAL8;
- } else if (s->bit_depth == 1) {
+ } else if (s->bit_depth == 1 && s->bits_per_pixel == 1) {
avctx->pix_fmt = PIX_FMT_MONOBLACK;
} else if (s->bit_depth == 8 &&
s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
