diff --git a/backport-CVE-2022-38784.patch b/backport-CVE-2022-38784.patch new file mode 100644 index 0000000000000000000000000000000000000000..022c0973d04b6af79adc9a3b1d5faa19eacbc0f5 --- /dev/null +++ b/backport-CVE-2022-38784.patch @@ -0,0 +1,31 @@ +From 27354e9d9696ee2bc063910a6c9a6b27c5184a52 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Thu, 25 Aug 2022 00:14:22 +0200 +Subject: [PATCH] JBIG2Stream: Fix crash on broken file + +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 662276e54..9f70431de 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); + } +-- +GitLab diff --git a/poppler.spec b/poppler.spec index 41dfde14f4c303123e3302d4e3905a836947eed7..fadd21d872900256cd9fff5aa9e2022577df7ef3 100644 --- a/poppler.spec +++ b/poppler.spec @@ -4,7 +4,7 @@ Name: poppler Version: 22.01.0 -Release: 1 +Release: 2 Summary: PDF rendering library License: GPLv2+ and LGPLv2+ and MIT URL: http://poppler.freedesktop.org/ @@ -14,6 +14,8 @@ Source1: %{name}-test-%{test_date}-%{test_sha}.tar.xz Patch1: poppler-0.90.0-position-independent-code.patch Patch3: poppler-21.01.0-glib-introspection.patch +Patch6001: backport-CVE-2022-38784.patch + BuildRequires: make BuildRequires: cmake BuildRequires: gcc-c++ @@ -248,6 +250,9 @@ test "$(pkg-config --modversion poppler-qt6)" = "%{version}" %{_mandir}/man1/* %changelog +* Tue Sep 06 2022 zhouwenpei - 22.01.0-2 +- fix CVE-2022-38784 + * Mon Jun 13 2022 lin zhang - 22.01.0-1 - Update to 22.01.0