diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-09 10:00:24 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-09 10:00:24 +0000 |
commit | d01dab1aae55990e6c4cb40fa9348a4ec82181d0 (patch) | |
tree | ee5527778354384b7e50c31fe2d3e8f561f59edc /app-office | |
parent | Unused patch. (diff) | |
download | gentoo-2-d01dab1aae55990e6c4cb40fa9348a4ec82181d0.tar.gz gentoo-2-d01dab1aae55990e6c4cb40fa9348a4ec82181d0.tar.bz2 gentoo-2-d01dab1aae55990e6c4cb40fa9348a4ec82181d0.zip |
Unused patch.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/koffice/Manifest | 11 | ||||
-rw-r--r-- | app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff | 74 |
2 files changed, 0 insertions, 85 deletions
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest index 8872b395256f..c9c889be2704 100644 --- a/app-office/koffice/Manifest +++ b/app-office/koffice/Manifest @@ -1,18 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX koffice-1.6.3-gcc43.patch 7295 RMD160 ca71ff7040b730430e9204f7ea0444ce12871bd4 SHA1 d52967622a661a842e6654250bc9956bf29c217f SHA256 28ea09e20e21c358294ecacec473d21178f023bfb9b360711835b114f6f61a18 AUX koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff 15961 RMD160 ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4 SHA1 a3d1d85567ccf729a2237f4aa837f7e025ce00ae SHA256 ed9b3ee5b1590aae930dc2829b9a463fac9cee5ab3e412423a4991109f507942 -AUX koffice-xpdf-CVE-2007-0104.diff 3185 RMD160 1ea990a06dfdc709362a6cb0fbb69851da86a3d6 SHA1 bef37ffafbae9a509363f7bc63806ab7162576b9 SHA256 36585b64bc23c9e352c0ff4edff9788add81381049dff5ae1d9de708f9696bfe AUX koffice-xpdf-CVE-2007-3387.diff 601 RMD160 7f620ec00ca05da91596f2d750d32ed8aa8bec95 SHA1 bff4f540389a77320bc87e2dedece50b82932e59 SHA256 8f4df5133452dba1469ec605393503d2b233d7aaccbbee0e5e42b79c24be9062 DIST koffice-1.6.3.tar.bz2 56829391 RMD160 e474ba48fa983fafb61ad58fb79cddda69ec6908 SHA1 de84214dec913eac1d47dab04dd93f3d81729fd3 SHA256 c3975f0a59f50aaa5547f1709b6fad54f746fd06815859b374676b426dce12cb EBUILD koffice-1.6.3-r2.ebuild 3840 RMD160 40666fa7501de4c2fb365fcc2c3fbdc3dd449242 SHA1 bd974b2eac9d2ee7af41aebc0e22841c4986f1fc SHA256 dd20299f5fe3325c456cee054e475065562b118b11213f3c2c83124c06bc88d1 MISC ChangeLog 33940 RMD160 fc89648306dcc610900e84692bf00aaf2613ba80 SHA1 e38c6a09d949a251ba1d1f909a97946341bd0f92 SHA256 f78140b7b8ab09c54b95c9089b3c75c4d963830e3edd53c4a98b18927f9d1caa MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkpLUXUACgkQjDdoMVfcAHh6zQCfa2khNfsJtGYJeWU4zrOVOZVG -Jw4AoM50+Y0hIArxtbt44a6EjbQWYZIO -=WFI1 ------END PGP SIGNATURE----- diff --git a/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff b/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff deleted file mode 100644 index f5e51a1c706e..000000000000 --- a/app-office/koffice/files/koffice-xpdf-CVE-2007-0104.diff +++ /dev/null @@ -1,74 +0,0 @@ ------------------------------------------------------------------------- -r622463 | aacid | 2007-01-11 23:05:54 +0100 (Thu, 11 Jan 2007) | 2 lines -Changed paths: - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc - M /branches/koffice/1.6/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.h - -Commiting the patch agreed between kpdf and poppler developers to fix MOAB-06-01-2007 issue. - ------------------------------------------------------------------------- -Index: filters/kword/pdf/xpdf/xpdf/Catalog.cc -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc (revision 622463) -@@ -24,6 +24,12 @@ - #include "Link.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 - //------------------------------------------------------------------------ -@@ -77,7 +83,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"); - } -@@ -171,7 +177,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; -@@ -221,9 +227,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()); -Index: filters/kword/pdf/xpdf/xpdf/Catalog.h -=================================================================== ---- filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622462) -+++ filters/kword/pdf/xpdf/xpdf/Catalog.h (revision 622463) -@@ -82,7 +82,7 @@ private: - Object outline; // outline 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); - }; - |