From 635d339c96fbd4c57a3f35b8a98e4ee90fd61853 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Dec 2021 04:12:29 -0500 Subject: [PATCH] import poppler-20.11.0-3.el8_5.1 --- SOURCES/poppler-20.11.0-bad-generation.patch | 35 ++++++++++++++++++++ SPECS/poppler.spec | 9 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 SOURCES/poppler-20.11.0-bad-generation.patch diff --git a/SOURCES/poppler-20.11.0-bad-generation.patch b/SOURCES/poppler-20.11.0-bad-generation.patch new file mode 100644 index 0000000..e4a0c1a --- /dev/null +++ b/SOURCES/poppler-20.11.0-bad-generation.patch @@ -0,0 +1,35 @@ +From 4f478daa6a9734b8f269a6586bdce2909844bb6f Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 23 Dec 2020 23:52:58 +0100 +Subject: Fix opening files by some generators that are a bit broken + +But Adobe opens it and it's easy to fix + +diff --git a/poppler/XRef.cc b/poppler/XRef.cc +index 66d3f04a..c36c747a 100644 +--- a/poppler/XRef.cc ++++ b/poppler/XRef.cc +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include "goo/gfile.h" + #include "goo/gmem.h" + #include "Object.h" +@@ -793,8 +794,13 @@ bool XRef::readXRefStreamSection(Stream *xrefStr, const int *w, int first, int n + gen = (gen << 8) + c; + } + if (gen > INT_MAX) { +- error(errSyntaxError, -1, "Gen inside xref table too large (bigger than INT_MAX)"); +- return false; ++ if (i == 0 && gen == std::numeric_limits::max()) { ++ // workaround broken generators ++ gen = 65535; ++ } else { ++ error(errSyntaxError, -1, "Gen inside xref table too large (bigger than INT_MAX)"); ++ return false; ++ } + } + if (entries[i].offset == -1) { + switch (type) { diff --git a/SPECS/poppler.spec b/SPECS/poppler.spec index 3d5af89..363f624 100644 --- a/SPECS/poppler.spec +++ b/SPECS/poppler.spec @@ -4,7 +4,7 @@ Summary: PDF rendering library Name: poppler Version: 20.11.0 -Release: 3%{?dist} +Release: 3%{?dist}.1 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz @@ -24,6 +24,9 @@ Patch21: poppler-0.66.0-nss.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1981108 Patch22: poppler-20.11.0-check-gdatetime.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2002691 +Patch23: poppler-20.11.0-bad-generation.patch + BuildRequires: cmake BuildRequires: gettext-devel BuildRequires: pkgconfig(cairo) @@ -228,6 +231,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %{_mandir}/man1/* %changelog +* Tue Oct 19 2021 Marek Kasik - 20.11.0-3.el8_5.1 +- Fix opening files with streams with wrong generations +- Resolves: #2002691 + * Wed Aug 4 2021 Marek Kasik - 20.11.0-3 - Fix crash when processing dates of embedded files - Resolves: #1981108