diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-05-02 10:58:55 -0700 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-06-03 19:16:37 +0200 |
| commit | 269dbc53599e588efc6027df634a9d5b9476c3fc (patch) | |
| tree | 89abcaf863b775a43397be5d2a6d8e1f84b4ba90 | |
| parent | 850298ef2538f02cd4671a4cc5035026b35c7bf5 (diff) | |
| download | ffmpeg-269dbc53599e588efc6027df634a9d5b9476c3fc.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>
| -rw-r--r-- | libavcodec/pngdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 1268c9e781..aed3d609fd 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -488,9 +488,11 @@ 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 if (s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + } else if (s->bit_depth == 8 && + s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { avctx->pix_fmt = PIX_FMT_Y400A; } else { goto fail; |