new upstream release 0.56.0
This commit is contained in:
parent
7010a49762
commit
977eab5a70
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/poppler-test-2009-05-13_0d2bfd4af4c76a3bac27ccaff793d9129df7b57a.tar.xz
|
||||
/poppler-0.53.0.tar.xz
|
||||
/poppler-0.55.0.tar.xz
|
||||
/poppler-0.56.0.tar.xz
|
||||
|
@ -1,60 +0,0 @@
|
||||
From 5c9b08a875b07853be6c44e43ff5f7f059df666a Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Sat, 27 May 2017 00:09:17 +0200
|
||||
Subject: [PATCH] pdfunite: Fix crash with broken documents
|
||||
|
||||
Sometimes we can't parse pages so check before accessing them
|
||||
|
||||
Thanks to Jiaqi Peng for the report
|
||||
|
||||
Fixes bugs #101153 and #101149
|
||||
---
|
||||
utils/pdfunite.cc | 12 ++++++++----
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
|
||||
index dfe48bf..c32e201 100644
|
||||
--- a/utils/pdfunite.cc
|
||||
+++ b/utils/pdfunite.cc
|
||||
@@ -7,7 +7,7 @@
|
||||
// Copyright (C) 2011-2015, 2017 Thomas Freitag <Thomas.Freitag@alfa.de>
|
||||
// Copyright (C) 2012 Arseny Solokha <asolokha@gmx.com>
|
||||
// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
|
||||
-// Copyright (C) 2012, 2014 Albert Astals Cid <aacid@kde.org>
|
||||
+// Copyright (C) 2012, 2014, 2017 Albert Astals Cid <aacid@kde.org>
|
||||
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
|
||||
// Copyright (C) 2013 Hib Eris <hib@hiberis.nl>
|
||||
// Copyright (C) 2015 Arthur Stavisky <vovodroid@gmail.com>
|
||||
@@ -268,15 +268,15 @@ int main (int argc, char *argv[])
|
||||
catDict->lookup("OutputIntents", &intents);
|
||||
catDict->lookupNF("AcroForm", &afObj);
|
||||
Ref *refPage = docs[0]->getCatalog()->getPageRef(1);
|
||||
- if (!afObj.isNull()) {
|
||||
+ if (!afObj.isNull() && refPage) {
|
||||
docs[0]->markAcroForm(&afObj, yRef, countRef, 0, refPage->num, refPage->num);
|
||||
}
|
||||
catDict->lookupNF("OCProperties", &ocObj);
|
||||
- if (!ocObj.isNull() && ocObj.isDict()) {
|
||||
+ if (!ocObj.isNull() && ocObj.isDict() && refPage) {
|
||||
docs[0]->markPageObjects(ocObj.getDict(), yRef, countRef, 0, refPage->num, refPage->num);
|
||||
}
|
||||
catDict->lookup("Names", &names);
|
||||
- if (!names.isNull() && names.isDict()) {
|
||||
+ if (!names.isNull() && names.isDict() && refPage) {
|
||||
docs[0]->markPageObjects(names.getDict(), yRef, countRef, 0, refPage->num, refPage->num);
|
||||
}
|
||||
if (intents.isArray() && intents.arrayGetLength() > 0) {
|
||||
@@ -353,6 +353,10 @@ int main (int argc, char *argv[])
|
||||
|
||||
for (i = 0; i < (int) docs.size(); i++) {
|
||||
for (j = 1; j <= docs[i]->getNumPages(); j++) {
|
||||
+ if (!docs[i]->getCatalog()->getPage(j)) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
PDFRectangle *cropBox = NULL;
|
||||
if (docs[i]->getCatalog()->getPage(j)->isCropped())
|
||||
cropBox = docs[i]->getCatalog()->getPage(j)->getCropBox();
|
||||
--
|
||||
2.9.3
|
||||
|
@ -3,8 +3,8 @@
|
||||
|
||||
Summary: PDF rendering library
|
||||
Name: poppler
|
||||
Version: 0.55.0
|
||||
Release: 2%{?dist}
|
||||
Version: 0.56.0
|
||||
Release: 1%{?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
|
||||
@ -13,7 +13,6 @@ Source1: %{name}-test-%{test_date}_%{test_sha}.tar.xz
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1185007
|
||||
Patch0: poppler-0.30.0-rotated-words-selection.patch
|
||||
Patch1: 0001-pdfunite-Fix-crash-with-broken-documents.patch
|
||||
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
@ -278,6 +277,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
|
||||
%{_bindir}/poppler-glib-demo
|
||||
|
||||
%changelog
|
||||
* Fri Jun 23 2017 David Tardon <dtardon@redhat.com> - 0.56.0-1
|
||||
- new upstream release
|
||||
|
||||
* Tue May 30 2017 Caolán McNamara <caolanm@redhat.com> - 0.55.0-2
|
||||
- Resolves: rhbz#1456828 CVE-2017-7511 Null pointer deference
|
||||
|
||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (poppler-0.55.0.tar.xz) = ea3008f2945da862236fcc64d320367e04e3c71d4cc5e996e0c50ac49457e5e42eb06af92486fe7f15c04f07a88367f5344f8dc76549c57c4a19e2fbb60f55d6
|
||||
SHA512 (poppler-0.56.0.tar.xz) = 74d2ca63afcb7e155c153b4ddc71621b7f4f2c60d4fcafd873176d5ac59fafedc35b200a22c7af2013d7f75e670a1cc23d6ba878167a02209917f8d30002d528
|
||||
SHA512 (poppler-test-2009-05-13_0d2bfd4af4c76a3bac27ccaff793d9129df7b57a.tar.xz) = f8ce114357043a893100de2d52ada8bd850148d19f0e8c889988ea97e9a92313f0545c0b88ef32a1ce7f0e9e58edc1a8c9066278c20b7718ca619913fd4bfb3c
|
||||
|
Loading…
Reference in New Issue
Block a user