This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 68e89b3019987d2bf6147b62a2b150a4483b0605 Author: Jun Zhao <[email protected]> AuthorDate: Wed Nov 18 15:09:46 2026 +0800 Commit: Jun Zhao <[email protected]> CommitDate: Thu Nov 19 06:55:44 2026 +0000 avformat/apngdec: retry probing when an ancillary chunk exceeds the buffer A large ancillary chunk before the first IDAT (e.g. a C2PA caBX manifest) can be bigger than the initial 2048-byte probe buffer. apng_probe() then returns 0 before reaching acTL/IDAT, so png_pipe wins with score 99 and only one frame is decoded. A probe buffer that ends on the next header, or inside a PLTE, rejects the file the same way. Return AVERROR(EAGAIN) when the next header is incomplete, or when an ancillary chunk or PLTE does not fit, so probing continues until acTL and IDAT are visible. Other critical chunks still return 0. Fixes: https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/26132 Signed-off-by: Jun Zhao <[email protected]> --- libavformat/apngdec.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c index 87be195df5..d163459831 100644 --- a/libavformat/apngdec.c +++ b/libavformat/apngdec.c @@ -84,6 +84,12 @@ static int apng_probe(const AVProbeData *p) return 0; for (;;) { + /* Fewer than 8 bytes left means the next length and type are not + * both present. bytestream2_get_be32() then returns 0, so the type + * looks critical and a valid APNG is rejected. Ask for the header. */ + if (bytestream2_get_bytes_left(&gb) < 8) + return AVERROR(EAGAIN); + len = bytestream2_get_be32(&gb); if (len > 0x7fffffff) return 0; @@ -92,8 +98,16 @@ static int apng_probe(const AVProbeData *p) /* we don't check IDAT size, as this is the last tag * we check, and it may be larger than the probe buffer */ if (tag != MKTAG('I', 'D', 'A', 'T') && - len + 4 > bytestream2_get_bytes_left(&gb)) + len + 4 > bytestream2_get_bytes_left(&gb)) { + /* Ancillary chunks (bit 5 of the first type byte set, i.e. a + * lowercase first letter) may be large, e.g. a C2PA manifest. + * A PLTE is critical but small, and it can still straddle the + * probe buffer. acTL/IDAT may follow either of them. Other + * critical chunks still reject the file. */ + if ((tag & 0x20) || tag == MKTAG('P', 'L', 'T', 'E')) + return AVERROR(EAGAIN); return 0; + } switch (tag) { case MKTAG('I', 'H', 'D', 'R'): -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
