diff --git a/SOURCES/poppler-20.11.0-check-bitmap-in-combine.patch b/SOURCES/poppler-20.11.0-check-bitmap-in-combine.patch new file mode 100644 index 0000000..7c6f8c5 --- /dev/null +++ b/SOURCES/poppler-20.11.0-check-bitmap-in-combine.patch @@ -0,0 +1,30 @@ +From 1f151565bbca5be7449ba8eea6833051cc1baa41 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Mon, 31 Mar 2025 14:35:49 +0200 +Subject: Move isOk check to inside JBIG2Bitmap::combine + + +diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc +index cf9e0c98..4e81d4a8 100644 +--- poppler-20.11.0/poppler/JBIG2Stream.cc ++++ poppler-20.11.0/poppler/JBIG2Stream.cc +@@ -15,7 +15,7 @@ + // + // Copyright (C) 2006 Raj Kumar + // Copyright (C) 2006 Paul Walmsley +-// Copyright (C) 2006-2010, 2012, 2014-2020 Albert Astals Cid ++// Copyright (C) 2006-2010, 2012, 2014-2020, 2025 Albert Astals Cid + // Copyright (C) 2009 David Benjamin + // Copyright (C) 2011 Edward Jiang + // Copyright (C) 2012 William Bader +@@ -740,6 +740,10 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *b + unsigned int src0, src1, src, dest, s1, s2, m1, m2, m3; + bool oneByte; + ++ if (unlikely(!isOk())) { ++ return; ++ } ++ + // check for the pathological case where y = -2^31 + if (y < -0x7fffffff) { + return; diff --git a/SPECS/poppler.spec b/SPECS/poppler.spec index 8977e88..762b132 100644 --- a/SPECS/poppler.spec +++ b/SPECS/poppler.spec @@ -4,7 +4,7 @@ Summary: PDF rendering library Name: poppler Version: 20.11.0 -Release: 12%{?dist} +Release: 13%{?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 @@ -51,6 +51,9 @@ Patch30: poppler-20.11.0-fix-crash-in-FoFiType1C.patch # https://issues.redhat.com/browse/RHEL-44330 Patch31: poppler-20.11.0-pdfinfo-dests.patch +# https://issues.redhat.com/browse/RHEL-131786 +Patch32: poppler-20.11.0-check-bitmap-in-combine.patch + BuildRequires: cmake BuildRequires: gettext-devel BuildRequires: pkgconfig(cairo) @@ -255,6 +258,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %{_mandir}/man1/* %changelog +* Tue Dec 16 2025 Marek Kasik - 20.11.0-13 +- Check bitmap in combine() +- Resolves: RHEL-131786 + * Fri Jul 26 2024 Marek Kasik - 20.11.0-12 - Fix crash in broken documents when using -dests - Fix versions in changelog