From d1a811217aebe014e9dca0c7d044b6b0056f419c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 09 2021 18:25:27 +0000
Subject: import poppler-20.11.0-3.el8


---

diff --git a/SOURCES/poppler-20.11.0-check-gdatetime.patch b/SOURCES/poppler-20.11.0-check-gdatetime.patch
new file mode 100644
index 0000000..2b9c457
--- /dev/null
+++ b/SOURCES/poppler-20.11.0-check-gdatetime.patch
@@ -0,0 +1,30 @@
+--- poppler-20.11.0/glib/poppler-attachment.cc
++++ poppler-20.11.0/glib/poppler-attachment.cc
+@@ -114,17 +114,21 @@ PopplerAttachment *_poppler_attachment_n
+         if (embFile->createDate()) {
+             priv->ctime = _poppler_convert_pdf_date_to_date_time(embFile->createDate());
+             G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+-            /* This will overflow on dates from after 2038. This field is
+-             * deprecated, only kept for backward compatibility. */
+-            attachment->ctime = (GTime)g_date_time_to_unix(priv->ctime);
++            if (priv->ctime != NULL) {
++                /* This will overflow on dates from after 2038. This field is
++                 * deprecated, only kept for backward compatibility. */
++                attachment->ctime = (GTime)g_date_time_to_unix(priv->ctime);
++            }
+             G_GNUC_END_IGNORE_DEPRECATIONS
+         }
+         if (embFile->modDate()) {
+             priv->mtime = _poppler_convert_pdf_date_to_date_time(embFile->modDate());
+             G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+-            /* This will overflow on dates from after 2038. This field is
+-             * deprecated, only kept for backward compatibility. */
+-            attachment->mtime = (GTime)g_date_time_to_unix(priv->mtime);
++            if (priv->mtime != NULL) {
++                /* This will overflow on dates from after 2038. This field is
++                 * deprecated, only kept for backward compatibility. */
++                attachment->mtime = (GTime)g_date_time_to_unix(priv->mtime);
++            }
+             G_GNUC_END_IGNORE_DEPRECATIONS
+         }
+ 
diff --git a/SPECS/poppler.spec b/SPECS/poppler.spec
index 3653f12..3d5af89 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: 3%{?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
@@ -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=1981108
+Patch22: poppler-20.11.0-check-gdatetime.patch
+
 BuildRequires: cmake
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig(cairo)
@@ -225,6 +228,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 4 2021 Marek Kasik <mkasik@redhat.com> - 20.11.0-3
+- Fix crash when processing dates of embedded files
+- Resolves: #1981108
+
 * Tue Dec 8 2020 Marek Kasik <mkasik@redhat.com> - 20.11.0-2
 - Improve python3 build dependency
 - Resolves: #1896335