From 4248daeefcbe447929abccc959a55a78265d68a2 Mon Sep 17 00:00:00 2001 From: AOSC OS Maintainers Date: Wed, 29 Jan 2025 07:50:24 +0000 Subject: [PATCH] poppler: update to 25.01.0 Co-authored-by: Kaiyang Wu (@OriginCode) Signed-off-by: Kaiyang Wu --- .../patches/0001-Debian-CVE-2021-30860.patch | 34 ------------------- runtime-doc/poppler/spec | 5 ++- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 runtime-doc/poppler/autobuild/patches/0001-Debian-CVE-2021-30860.patch diff --git a/runtime-doc/poppler/autobuild/patches/0001-Debian-CVE-2021-30860.patch b/runtime-doc/poppler/autobuild/patches/0001-Debian-CVE-2021-30860.patch deleted file mode 100644 index 0441f95ccff..00000000000 --- a/runtime-doc/poppler/autobuild/patches/0001-Debian-CVE-2021-30860.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Albert Astals Cid -Date: Thu, 25 Aug 2022 00:14:22 +0200 -Subject: JBIG2Stream: Fix crash on broken file -Origin: https://gitlab.freedesktop.org/poppler/poppler/-/commit/27354e9d9696ee2bc063910a6c9a6b27c5184a52 -Bug-Debian: https://bugs.debian.org/1018971 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2022-38784 - -https://github.com/jeffssh/CVE-2021-30860 - -Thanks to David Warren for the heads up ---- - poppler/JBIG2Stream.cc | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc -index 662276e547eb..9f70431de49e 100644 ---- a/poppler/JBIG2Stream.cc -+++ b/poppler/JBIG2Stream.cc -@@ -1976,7 +1976,11 @@ void JBIG2Stream::readTextRegionSeg(unsigned int segNum, bool imm, bool lossless - for (i = 0; i < nRefSegs; ++i) { - if ((seg = findSegment(refSegs[i]))) { - if (seg->getType() == jbig2SegSymbolDict) { -- numSyms += ((JBIG2SymbolDict *)seg)->getSize(); -+ const unsigned int segSize = ((JBIG2SymbolDict *)seg)->getSize(); -+ if (unlikely(checkedAdd(numSyms, segSize, &numSyms))) { -+ error(errSyntaxError, getPos(), "Too many symbols in JBIG2 text region"); -+ return; -+ } - } else if (seg->getType() == jbig2SegCodeTable) { - codeTables.push_back(seg); - } --- -2.37.2 - diff --git a/runtime-doc/poppler/spec b/runtime-doc/poppler/spec index dc68f145181..f8fe6cdc041 100644 --- a/runtime-doc/poppler/spec +++ b/runtime-doc/poppler/spec @@ -1,5 +1,4 @@ -VER=22.08.0 -REL=2 +VER=25.01.0 SRCS="tbl::https://poppler.freedesktop.org/poppler-$VER.tar.xz" -CHKSUMS="sha256::b493328721402f25cb7523f9cdc2f7d7c59f45ad999bde75c63c90604db0f20b" +CHKSUMS="sha256::7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112" CHKUPDATE="anitya::id=3686"