diff options
author | 2008-02-17 03:31:00 +0000 | |
---|---|---|
committer | 2008-02-17 03:31:00 +0000 | |
commit | 1f0d82e30a76e7b698e006c0b23ef4ba43d716db (patch) | |
tree | 71740acf58d3dc2cadad8ebbfe1669f80226a1ea /kde-base/kpdf/files | |
parent | Spring Cleaning (diff) | |
download | historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.tar.gz historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.tar.bz2 historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.zip |
Spring cleaning.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'kde-base/kpdf/files')
3 files changed, 0 insertions, 88 deletions
diff --git a/kde-base/kpdf/files/kpdf-3.5.7-hash_path.diff b/kde-base/kpdf/files/kpdf-3.5.7-hash_path.diff deleted file mode 100644 index 1c3ac507c049..000000000000 --- a/kde-base/kpdf/files/kpdf-3.5.7-hash_path.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- branches/KDE/3.5/kdegraphics/kpdf/part.cpp #703563:703564 -@@ -612,7 +612,7 @@ - m_pageView->showText(i18n("Reloading the document..."), 0); - } - -- if (KParts::ReadOnlyPart::openURL(m_file)) -+ if (KParts::ReadOnlyPart::openURL(KURL::fromPathOrURL(m_file))) - { - if (m_viewportDirty.pageNumber >= (int)m_document->pages()) m_viewportDirty.pageNumber = (int)m_document->pages() - 1; - m_document->setViewport(m_viewportDirty); diff --git a/kde-base/kpdf/files/post-3.5.5-kdegraphics-CVE-2007-0104.diff b/kde-base/kpdf/files/post-3.5.5-kdegraphics-CVE-2007-0104.diff deleted file mode 100644 index 092cf67f360b..000000000000 --- a/kde-base/kpdf/files/post-3.5.5-kdegraphics-CVE-2007-0104.diff +++ /dev/null @@ -1,61 +0,0 @@ ---- kpdf/xpdf/xpdf/Catalog.cc -+++ kpdf/xpdf/xpdf/Catalog.cc -@@ -26,6 +26,12 @@ - #include "UGString.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -76,7 +82,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -191,7 +197,7 @@ GString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -236,9 +242,13 @@ int Catalog::readPageTree(Dict *pagesDic - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); ---- kpdf/xpdf/xpdf/Catalog.h -+++ kpdf/xpdf/xpdf/Catalog.h -@@ -128,7 +128,7 @@ private: - Object acroForm; // AcroForm dictionary - GBool ok; // true if catalog is valid - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GString *name, Object *obj); - }; - diff --git a/kde-base/kpdf/files/post-3.5.7-kdegraphics-CVE-2007-3387.diff b/kde-base/kpdf/files/post-3.5.7-kdegraphics-CVE-2007-3387.diff deleted file mode 100644 index e28add87e275..000000000000 --- a/kde-base/kpdf/files/post-3.5.7-kdegraphics-CVE-2007-3387.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: kpdf/xpdf/xpdf/Stream.cc -=================================================================== ---- kpdf/xpdf/xpdf/Stream.cc (revision 689574) -+++ kpdf/xpdf/xpdf/Stream.cc (working copy) -@@ -411,9 +411,9 @@ StreamPredictor::StreamPredictor(Stream - - nVals = width * nComps; - if (width <= 0 || nComps <= 0 || nBits <= 0 || -- nComps >= INT_MAX / nBits || -- width >= INT_MAX / nComps / nBits || -- nVals * nBits + 7 < 0) { -+ nComps > gfxColorMaxComps || nBits > 16 || -+ width >= INT_MAX / nComps || -+ nVals >= (INT_MAX - 7) / nBits) { - return; - } - pixBytes = (nComps * nBits + 7) >> 3; |