JBIG2Stream: Fix crash on broken file (CVE-2022-38784)

Closes: #1018971

debian/changelog

+poppler (22.08.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * JBIG2Stream: Fix crash on broken file (CVE-2022-38784) (Closes: #1018971)
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 03 Sep 2022 21:30:51 +0200
+
 poppler (22.08.0-2) unstable; urgency=medium
 
   * Team upload

debian/patches/JBIG2Stream-Fix-crash-on-broken-file.patch

+From: Albert Astals Cid <aacid@kde.org>
+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
+

debian/patches/series

 segfault-on-unset-catalog.patch
+JBIG2Stream-Fix-crash-on-broken-file.patch