diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2012-06-03 19:35:50 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-06-03 19:35:50 +0200 |
| commit | 5a9588b088423772ba567a71a3b0d4800c77d407 (patch) | |
| tree | ddd3563c04b472b53400ea63551ff177704b290b | |
| parent | 02cd93f4ad432769bdda96c36e920d3664bc3e75 (diff) | |
| download | ffmpeg-5a9588b088423772ba567a71a3b0d4800c77d407.tar.gz | |
png: check bit depth for PAL8/Y400A pixel formats.
Wrong bit depth can lead to invalid rowsize values, which crashes the
decoder further down.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit d2205d6543881f2e6fa18c8a354bbcf91a1235f7)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit b8d6ba9d50e80fdce2ed74cdaffd4960df8a21c5)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 33f93005f1a86c108302b4c5978aa1a3d8e092cc)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 4c8c2660bd9252775c9a1dc2e2f36cb34718595a)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:
libavcodec/pngdec.c
| -rw-r--r-- | libavcodec/pngdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index a3431525b6..d583a523b0 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -473,7 +473,8 @@ static int decode_frame(AVCodecContext *avctx, } else if (s->bit_depth == 1 && s->color_type == PNG_COLOR_TYPE_GRAY) { avctx->pix_fmt = PIX_FMT_MONOBLACK; - } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) { + } else if (s->bit_depth == 8 && + s->color_type == PNG_COLOR_TYPE_PALETTE) { avctx->pix_fmt = PIX_FMT_PAL8; } else { goto fail; |