mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-14 22:22:59 +02:00
avcodec/pngdec: use 8-bit sBIT cap for indexed PNGs per spec
The PNG specification[1] says that sBIT entries must be at most the bit depth specified in IHDR, unless the PNG is indexed-color, in which case sBIT must be between 1 and 8. We should not reject valid sBITs on PNGs with indexed color. [1]: https://www.w3.org/TR/png-3/#11sBIT Regression since 84b454935fae2633a8a5dd075e22393f3e8f932f. Signed-off-by: Leo Izen <leo.izen@gmail.com> Reported-by: Ramiro Polla <ramiro.polla@gmail.com>
This commit is contained in:
parent
e2105b2800
commit
825606641b
@ -1097,7 +1097,7 @@ static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s,
|
||||
bits = FFMAX(b, bits);
|
||||
}
|
||||
|
||||
if (bits < 0 || bits > s->bit_depth) {
|
||||
if (bits <= 0 || bits > (s->color_type & PNG_COLOR_MASK_PALETTE ? 8 : s->bit_depth)) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Invalid significant bits: %d\n", bits);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user