From 08535bbea5d8b3a81800007384787389d8d0606f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 21 2021 07:16:03 +0000
Subject: import poppler-20.11.0-2.el8_4.1


---

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 <aacid@kde.org>
+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 <cctype>
+ #include <climits>
+ #include <cfloat>
++#include <limits>
+ #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<uint32_t>::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 3653f12..ab189be 100644
--- a/SPECS/poppler.spec
+++ b/SPECS/poppler.spec
@@ -4,7 +4,7 @@
 Summary: PDF rendering library
 Name:    poppler
 Version: 20.11.0
-Release: 2%{?dist}
+Release: 2%{?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
@@ -21,6 +21,9 @@ Patch4:  poppler-0.66.0-covscan.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1618766
 Patch21: poppler-0.66.0-nss.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2002638
+Patch22: poppler-20.11.0-bad-generation.patch
+
 BuildRequires: cmake
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig(cairo)
@@ -225,6 +228,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 9 2021 Marek Kasik <mkasik@redhat.com> - 20.11.0-2.el8_4.1
+- Fix opening files with streams with wrong generations
+- Resolves: #2002638
+
 * Tue Dec 8 2020 Marek Kasik <mkasik@redhat.com> - 20.11.0-2
 - Improve python3 build dependency
 - Resolves: #1896335