diff --git a/poppler-20.11.0-jbig-symbol-overflow.patch b/poppler-20.11.0-jbig-symbol-overflow.patch new file mode 100644 index 0000000000000000000000000000000000000000..9a7cc0c314bae6566daccbd25acfa1df20bdce14 --- /dev/null +++ b/poppler-20.11.0-jbig-symbol-overflow.patch @@ -0,0 +1,26 @@ +From 27354e9d9696ee2bc063910a6c9a6b27c5184a52 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Thu, 25 Aug 2022 00:14:22 +0200 +Subject: JBIG2Stream: Fix crash on broken file + +https://github.com/jeffssh/CVE-2021-30860 + +Thanks to David Warren for the heads up + +diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc +index 662276e5..9f70431d 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); + } diff --git a/poppler.spec b/poppler.spec index 9cfd03c392e943cd1e615a31e0c871d6bdd8f885..8255130778a4d818858e8aecd2223ccfc7664286 100644 --- a/poppler.spec +++ b/poppler.spec @@ -5,7 +5,7 @@ Summary: PDF rendering library Name: poppler Version: 20.11.0 -Release: 5%{anolis_release}%{?dist} +Release: 6%{anolis_release}%{?dist} License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz @@ -31,6 +31,9 @@ Patch23: poppler-20.11.0-bad-generation.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2087190 Patch24: poppler-20.11.0-hints.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2124527 +Patch25: poppler-20.11.0-jbig-symbol-overflow.patch + BuildRequires: cmake BuildRequires: gettext-devel BuildRequires: pkgconfig(cairo) @@ -247,9 +250,14 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %doc README.md %changelog -* Tue Jan 03 2023 Weisson - 20.11.0-5.0.1 +* Fri May 26 2023 Weisson - 20.11.0-6.0.1 - Add doc sub package +* Tue Sep 20 2022 Marek Kasik - 20.11.0-6 +- Check for overflow when computing number of symbols +- in JBIG2 text region +- Resolves: #2126361 + * Fri Jun 17 2022 Marek Kasik - 20.11.0-5 - Don't run out of file for Hints - Rebuild for #2096452