| 1 |
commit: 6b4dd6468f8573e838fb8ffb1dd623a533b3d203 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Aug 8 16:21:44 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 8 17:15:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b4dd646 |
| 7 |
|
| 8 |
app-text/poppler: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5358 |
| 11 |
|
| 12 |
.../files/poppler-0.55.0-CVE-2017-7511.patch | 57 ---------------------- |
| 13 |
1 file changed, 57 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-text/poppler/files/poppler-0.55.0-CVE-2017-7511.patch b/app-text/poppler/files/poppler-0.55.0-CVE-2017-7511.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 64df1cfde43..00000000000 |
| 18 |
--- a/app-text/poppler/files/poppler-0.55.0-CVE-2017-7511.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,57 +0,0 @@ |
| 21 |
-From 5c9b08a875b07853be6c44e43ff5f7f059df666a Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Albert Astals Cid <aacid@×××.org> |
| 23 |
-Date: Sat, 27 May 2017 00:09:17 +0200 |
| 24 |
-Subject: pdfunite: Fix crash with broken documents |
| 25 |
- |
| 26 |
-Sometimes we can't parse pages so check before accessing them |
| 27 |
- |
| 28 |
-Thanks to Jiaqi Peng for the report |
| 29 |
- |
| 30 |
-Fixes bugs #101153 and #101149 |
| 31 |
- |
| 32 |
-diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc |
| 33 |
-index dfe48bf..c32e201 100644 |
| 34 |
---- a/utils/pdfunite.cc |
| 35 |
-+++ b/utils/pdfunite.cc |
| 36 |
-@@ -7,7 +7,7 @@ |
| 37 |
- // Copyright (C) 2011-2015, 2017 Thomas Freitag <Thomas.Freitag@××××.de> |
| 38 |
- // Copyright (C) 2012 Arseny Solokha <asolokha@×××.com> |
| 39 |
- // Copyright (C) 2012 Fabio D'Urso <fabiodurso@×××××××.it> |
| 40 |
--// Copyright (C) 2012, 2014 Albert Astals Cid <aacid@×××.org> |
| 41 |
-+// Copyright (C) 2012, 2014, 2017 Albert Astals Cid <aacid@×××.org> |
| 42 |
- // Copyright (C) 2013 Adrian Johnson <ajohnson@×××××××.com> |
| 43 |
- // Copyright (C) 2013 Hib Eris <hib@×××××××.nl> |
| 44 |
- // Copyright (C) 2015 Arthur Stavisky <vovodroid@×××××.com> |
| 45 |
-@@ -268,15 +268,15 @@ int main (int argc, char *argv[]) |
| 46 |
- catDict->lookup("OutputIntents", &intents); |
| 47 |
- catDict->lookupNF("AcroForm", &afObj); |
| 48 |
- Ref *refPage = docs[0]->getCatalog()->getPageRef(1); |
| 49 |
-- if (!afObj.isNull()) { |
| 50 |
-+ if (!afObj.isNull() && refPage) { |
| 51 |
- docs[0]->markAcroForm(&afObj, yRef, countRef, 0, refPage->num, refPage->num); |
| 52 |
- } |
| 53 |
- catDict->lookupNF("OCProperties", &ocObj); |
| 54 |
-- if (!ocObj.isNull() && ocObj.isDict()) { |
| 55 |
-+ if (!ocObj.isNull() && ocObj.isDict() && refPage) { |
| 56 |
- docs[0]->markPageObjects(ocObj.getDict(), yRef, countRef, 0, refPage->num, refPage->num); |
| 57 |
- } |
| 58 |
- catDict->lookup("Names", &names); |
| 59 |
-- if (!names.isNull() && names.isDict()) { |
| 60 |
-+ if (!names.isNull() && names.isDict() && refPage) { |
| 61 |
- docs[0]->markPageObjects(names.getDict(), yRef, countRef, 0, refPage->num, refPage->num); |
| 62 |
- } |
| 63 |
- if (intents.isArray() && intents.arrayGetLength() > 0) { |
| 64 |
-@@ -353,6 +353,10 @@ int main (int argc, char *argv[]) |
| 65 |
- |
| 66 |
- for (i = 0; i < (int) docs.size(); i++) { |
| 67 |
- for (j = 1; j <= docs[i]->getNumPages(); j++) { |
| 68 |
-+ if (!docs[i]->getCatalog()->getPage(j)) { |
| 69 |
-+ continue; |
| 70 |
-+ } |
| 71 |
-+ |
| 72 |
- PDFRectangle *cropBox = NULL; |
| 73 |
- if (docs[i]->getCatalog()->getPage(j)->isCropped()) |
| 74 |
- cropBox = docs[i]->getCatalog()->getPage(j)->getCropBox(); |
| 75 |
--- |
| 76 |
-cgit v0.10.2 |
| 77 |
- |
Archives