summaryrefslogtreecommitdiffstats
path: root/patches/source/poppler/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/source/poppler/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch')
-rw-r--r--patches/source/poppler/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/patches/source/poppler/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch b/patches/source/poppler/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch
new file mode 100644
index 000000000..a4ee928c5
--- /dev/null
+++ b/patches/source/poppler/27354e9d9696ee2bc063910a6c9a6b27c5184a52.patch
@@ -0,0 +1,29 @@
+From 27354e9d9696ee2bc063910a6c9a6b27c5184a52 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+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 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);
+ }