From e68ad0661938b445930b21756d74114ed528ef42 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2020 11:57:26 +0000
Subject: import poppler-0.66.0-27.el8


---

diff --git a/SOURCES/poppler-0.66.0-tilingpatternfill-crash.patch b/SOURCES/poppler-0.66.0-tilingpatternfill-crash.patch
new file mode 100644
index 0000000..b85bcfe
--- /dev/null
+++ b/SOURCES/poppler-0.66.0-tilingpatternfill-crash.patch
@@ -0,0 +1,28 @@
+From b224e2f5739fe61de9fa69955d016725b2a4b78d Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 15 Jul 2019 22:11:09 +0200
+Subject: [PATCH] SplashOutputDev::tilingPatternFill: Fix crash on broken file
+
+Issue #802
+---
+ poppler/SplashOutputDev.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
+index 544f132d..3d2befc2 100644
+--- a/poppler/SplashOutputDev.cc
++++ b/poppler/SplashOutputDev.cc
+@@ -4581,6 +4581,10 @@ bool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
+     surface_width = (int) ceil (fabs(kx));
+     surface_height = (int) ceil (fabs(ky));
+     // adjust repeat values to completely fill region
++    if (unlikely(surface_width == 0 || surface_height == 0)) {
++        state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
++        return gFalse;
++    }
+     repeatX = result_width / surface_width;
+     repeatY = result_height / surface_height;
+     if (surface_width * repeatX < result_width)
+-- 
+2.24.1
+
diff --git a/SPECS/poppler.spec b/SPECS/poppler.spec
index d2cf10d..8f76ef9 100644
--- a/SPECS/poppler.spec
+++ b/SPECS/poppler.spec
@@ -4,7 +4,7 @@
 Summary: PDF rendering library
 Name:    poppler
 Version: 0.66.0
-Release: 26%{?dist}
+Release: 27%{?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
@@ -82,6 +82,9 @@ Patch23: poppler-0.66.0-JPXStream-length.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1696636
 Patch24: poppler-0.66.0-PSOutputDev-rgb.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1797453
+Patch25: poppler-0.66.0-tilingpatternfill-crash.patch
+
 BuildRequires: cmake
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig(cairo)
@@ -284,6 +287,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 16 2020 Marek Kasik <mkasik@redhat.com> - 0.66.0-27
+- Fix crash on broken file in tilingPatternFill()
+- Resolves: #1801341
+
 * Tue Aug 13 2019 Marek Kasik <mkasik@redhat.com> - 0.66.0-26
 - Coverity scan related fixes
 - Related: #1618766