diff --git a/poppler-21.01.0-check-bitmap-in-combine.patch b/poppler-21.01.0-check-bitmap-in-combine.patch new file mode 100644 index 0000000..afaef91 --- /dev/null +++ b/poppler-21.01.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-21.01.0/poppler/JBIG2Stream.cc ++++ poppler-21.01.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 +@@ -766,6 +766,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/poppler.spec b/poppler.spec index fc0c735..b68fe66 100644 --- a/poppler.spec +++ b/poppler.spec @@ -3,7 +3,7 @@ Summary: PDF rendering library Name: poppler Version: 21.01.0 -Release: 21%{?dist} +Release: 22%{?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 @@ -53,6 +53,10 @@ Patch13: poppler-21.01.0-copy-filename.patch # https://issues.redhat.com/browse/RHEL-44333 Patch14: poppler-21.01.0-pdfinfo-dests.patch +# https://issues.redhat.com/browse/RHEL-131795 +# https://issues.redhat.com/browse/RHEL-131792 +Patch15: poppler-21.01.0-check-bitmap-in-combine.patch + BuildRequires: make BuildRequires: cmake BuildRequires: gcc-c++ @@ -246,6 +250,10 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}" %{_mandir}/man1/* %changelog +* Mon Dec 15 2025 Marek Kasik - 21.01.0-22 +- Check bitmap in combine() +- Resolves: RHEL-131795, RHEL-131792 + * Fri Jul 26 2024 Marek Kasik - 21.01.0-21 - Fix crash in broken documents when using -dests - Resolves: RHEL-44333