[poppler/f19] Fix crash when getPage() returns NULL

[mkasik]

commit 13dc60e1db8ad032ee1c28d07bca9d38f45507c5
Author: Marek Kasik <mkasik at redhat.com>
Date:   Fri Dec 12 16:46:22 2014 +0100

    Fix crash when getPage() returns NULL
    
    Resolves: #1164389

 poppler-0.22.1-pdfdetach.patch |   26 ++++++++++++++++++++++++++
 poppler.spec                   |   10 +++++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/poppler-0.22.1-pdfdetach.patch b/poppler-0.22.1-pdfdetach.patch
new file mode 100644
index 0000000..e7eebde
--- /dev/null
+++ b/poppler-0.22.1-pdfdetach.patch
@@ -0,0 +1,26 @@
+From 88dbd4df0998233939b4a51cedbfc65c58a315f9 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson at redneon.com>
+Date: Sun, 19 Oct 2014 22:47:15 +1030
+Subject: [PATCH] pdfdetach: fix crash when getPage() returns null
+
+Bug 85145
+---
+ utils/pdfdetach.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/utils/pdfdetach.cc b/utils/pdfdetach.cc
+index 4f67fd7..3bae3c0 100644
+--- a/utils/pdfdetach.cc
++++ b/utils/pdfdetach.cc
+@@ -163,6 +163,8 @@ int main(int argc, char *argv[]) {
+   nPages = doc->getCatalog()->getNumPages();
+   for (i = 0; i < nPages; ++i) {
+     page = doc->getCatalog()->getPage(i + 1);
++    if (!page)
++      continue;
+     annots = page->getAnnots();
+     if (!annots)
+       break;
+-- 
+2.1.0
+
diff --git a/poppler.spec b/poppler.spec
index 813c0d4..df1c149 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,7 +1,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.22.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -19,6 +19,9 @@ Patch2: poppler-0.22.1-CVE-2013-4473.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1024762
 Patch3: poppler-0.22.1-CVE-2013-4474.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1164389
+Patch4: poppler-0.22.1-pdfdetach.patch
+
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
 BuildRequires: gettext-devel
@@ -136,6 +139,7 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 %patch1 -p1 -b .0.22.4
 %patch2 -p1 -b .CVE-2013-4473
 %patch3 -p1 -b .CVE-2013-4474
+%patch4 -p1 -b .pdfdetach
 
 iconv -f iso-8859-1 -t utf-8 < "utils/pdftohtml.1" > "utils/pdftohtml.1.utf8"
 mv "utils/pdftohtml.1.utf8" "utils/pdftohtml.1"
@@ -258,6 +262,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Fri Dec 12 2014 Marek Kasik <mkasik at redhat.com> 0.22.1-6
+- Fix crash when getPage() returns NULL
+- Resolves: #1164389
+
 * Thu Oct 31 2013 Marek Kasik <mkasik at redhat.com> 0.22.1-5
 - Fixes CVE-2013-4473 (Limit length of output to pathName buffer)
 - Fixes CVE-2013-4474 (Check file pattern)