commit: 6b4dd6468f8573e838fb8ffb1dd623a533b3d203 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Aug 8 16:21:44 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Aug 8 17:15:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b4dd646
app-text/poppler: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/5358 .../files/poppler-0.55.0-CVE-2017-7511.patch | 57 ---------------------- 1 file changed, 57 deletions(-) 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 deleted file mode 100644 index 64df1cfde43..00000000000 --- a/app-text/poppler/files/poppler-0.55.0-CVE-2017-7511.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 5c9b08a875b07853be6c44e43ff5f7f059df666a Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aa...@kde.org> -Date: Sat, 27 May 2017 00:09:17 +0200 -Subject: 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 - -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.frei...@alfa.de> - // Copyright (C) 2012 Arseny Solokha <asolo...@gmx.com> - // Copyright (C) 2012 Fabio D'Urso <fabiodu...@hotmail.it> --// Copyright (C) 2012, 2014 Albert Astals Cid <aa...@kde.org> -+// Copyright (C) 2012, 2014, 2017 Albert Astals Cid <aa...@kde.org> - // Copyright (C) 2013 Adrian Johnson <ajohn...@redneon.com> - // Copyright (C) 2013 Hib Eris <h...@hiberis.nl> - // Copyright (C) 2015 Arthur Stavisky <vovodr...@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(); --- -cgit v0.10.2 -
