diff options
author | Gregorio Guidi <greg_g@gentoo.org> | 2005-02-08 14:35:55 +0000 |
---|---|---|
committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-02-08 14:35:55 +0000 |
commit | d618289da09822b2c0bb20540800fde65d8afebc (patch) | |
tree | f737b3a2676a2e8b14e3b5581dd78a19228fcafa /kde-base/kdegraphics/files | |
parent | Remove blockers on removed packages. (diff) | |
download | gentoo-2-d618289da09822b2c0bb20540800fde65d8afebc.tar.gz gentoo-2-d618289da09822b2c0bb20540800fde65d8afebc.tar.bz2 gentoo-2-d618289da09822b2c0bb20540800fde65d8afebc.zip |
Remove old ebuilds.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'kde-base/kdegraphics/files')
17 files changed, 0 insertions, 500 deletions
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.0 b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.0 deleted file mode 100644 index 0200f2d4bece..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 675dd4f557574097b911350cc47f0843 kdegraphics-3.2.0.tar.bz2 5672335 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.2 deleted file mode 100644 index baca0ef915b9..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 d74038c154a5ecd924a50b57d4c79c43 kdegraphics-3.2.2.tar.bz2 5669199 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3 b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3 deleted file mode 100644 index 2e0072d98c01..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 5676995 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r1 deleted file mode 100644 index 2e0072d98c01..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 5676995 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r2 deleted file mode 100644 index 2e0072d98c01..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.2.3-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 5676995 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0 deleted file mode 100644 index 6aa32ec56f90..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 7bb9843f7b03cd2716079ac83b9c9304 kdegraphics-3.3.0.tar.bz2 6444906 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0-r1 deleted file mode 100644 index 6aa32ec56f90..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7bb9843f7b03cd2716079ac83b9c9304 kdegraphics-3.3.0.tar.bz2 6444906 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0-r2 deleted file mode 100644 index 6aa32ec56f90..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.0-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 7bb9843f7b03cd2716079ac83b9c9304 kdegraphics-3.3.0.tar.bz2 6444906 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.1 deleted file mode 100644 index 484cea392932..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 18f063ec6fad27b304ae97cf4b480140 kdegraphics-3.3.1.tar.bz2 6419816 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.1-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.1-r1 deleted file mode 100644 index 484cea392932..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 18f063ec6fad27b304ae97cf4b480140 kdegraphics-3.3.1.tar.bz2 6419816 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2 deleted file mode 100644 index 19c2a1ed829e..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 03092b8be2f7054d71895b8fd58ad26e kdegraphics-3.3.2.tar.bz2 6234394 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r1 deleted file mode 100644 index 19c2a1ed829e..000000000000 --- a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 03092b8be2f7054d71895b8fd58ad26e kdegraphics-3.3.2.tar.bz2 6234394 diff --git a/kde-base/kdegraphics/files/kdegraphics-3.2.2-gcc34-compile.patch b/kde-base/kdegraphics/files/kdegraphics-3.2.2-gcc34-compile.patch deleted file mode 100644 index ff9bce562a39..000000000000 --- a/kde-base/kdegraphics/files/kdegraphics-3.2.2-gcc34-compile.patch +++ /dev/null @@ -1,172 +0,0 @@ -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp 2002-12-30 22:55:16.000000000 +0300 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp 2004-04-21 22:54:55.760403944 +0400 -@@ -311,7 +311,7 @@ - m_dataType = PMVariant::ObjectPointer; - } - else -- ( ( PMObject* ) m_pData ) = obj; -+ m_pData = ( void* ) obj; - } - - int PMVariant::intData( ) const -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h 2003-10-26 13:52:36.000000000 +0300 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h 2004-04-22 00:12:13.212404080 +0400 -@@ -90,7 +90,7 @@ - // kdDebug(26004) << "KSVGBridge::put(), " << propertyName.qstring() << " Name: " << classInfo()->className << " Object: " << m_impl << endl; - - // Try to see if we know this property (and need to take special action) -- if(m_impl->put(exec, propertyName, value, attr)) -+ if(this->m_impl->put(exec, propertyName, value, attr)) - return; - - // We don't -> set property in ObjectImp. -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h 2003-08-17 15:49:23.000000000 +0400 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h 2004-04-21 23:34:50.954279128 +0400 -@@ -21,10 +21,13 @@ - #ifndef KSVG_LOOKUP_H - #define KSVG_LOOKUP_H - -+#include <kdebug.h> -+ - #include <kjs/object.h> - #include <kjs/lookup.h> - #include <kjs/interpreter.h> // for ExecState - -+//#include "ksvg_scriptinterpreter.h" - class KSVGScriptInterpreter; - - #define KSVG_GET_COMMON \ -@@ -188,6 +191,7 @@ - * The "this" class must implement putValueProperty. - * If it returns false, put() will return false, and KSVGRequest will set a dynamic property in ObjectImp - */ -+/* - template <class ThisImp> - inline bool lookupPut(KJS::ExecState *exec, - const KJS::Identifier &propertyName, -@@ -218,6 +222,7 @@ - return true; - } - } -+*/ /* moved to ksvg_scriptinterpreter.h */ - } - - // Same as kjs' DEFINE_PROTOTYPE, but with a pointer to the hashtable too, and no ClassName here -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h 2003-05-10 13:32:50.000000000 +0400 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h 2004-04-21 23:40:36.693718744 +0400 -@@ -68,6 +68,47 @@ - QPtrDict<KJS::ObjectImp> m_domObjects; - }; - -+namespace KSVG -+{ -+ -+ /** -+ * This one is for "put". -+ * Lookup hash entry for property to be set, and set the value. -+ * The "this" class must implement putValueProperty. -+ * If it returns false, put() will return false, and KSVGRequest will set a dynamic property in ObjectImp -+ */ -+ template <class ThisImp> -+ inline bool lookupPut(KJS::ExecState *exec, -+ const KJS::Identifier &propertyName, -+ const KJS::Value &value, -+ int attr, -+ const KJS::HashTable *table, -+ ThisImp *thisObj) -+ { -+ const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName); -+ -+ if(!entry) // not found, forward to parents -+ return thisObj->putInParents(exec, propertyName, value, attr); -+ else if(entry->attr & KJS::Function) // Function: put as override property -+ return false; -+ else if(entry->attr & KJS::ReadOnly && !(attr & KJS::Internal)) // readonly! Can't put! -+ { -+#ifdef KJS_VERBOSE -+ kdWarning(26004) <<" Attempt to change value of readonly property '" << propertyName.qstring() << "'" << endl; -+#endif -+ return true; // "we did it" -> don't put override property -+ } -+ else -+ { -+ if(static_cast<KSVGScriptInterpreter *>(exec->interpreter())->attributeSetMode()) -+ thisObj->m_attrFlags |= (1 << entry->value); -+ -+ thisObj->putValueProperty(exec, entry->value, value, attr); -+ return true; -+ } -+ } -+} -+ - // Lookup or create JS object around an existing "DOM Object" - template<class DOMObj, class KJSDOMObj> - inline KJS::Value cacheDOMObject(KJS::ExecState *exec, DOMObj *domObj) -@@ -100,7 +141,7 @@ - { - ClassCtor* ctor = new ClassCtor(exec); // create the ClassCtor instance - KJS::Object newObject(new KSVGBridge<ClassCtor>(exec, ctor)); // create the bridge around it -- exec->interpreter()->globalObject().put(exec, propertyName, newObject, Internal); -+ exec->interpreter()->globalObject().put(exec, propertyName, newObject, KJS::Internal); - return newObject; - } - } -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h 2003-08-28 00:08:25.000000000 +0400 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h 2004-04-22 00:04:58.029561928 +0400 -@@ -23,6 +23,7 @@ - - #include <dom/dom_element.h> - -+#include "SVGElementImpl.h" - #include "SVGLengthImpl.h" - - #include "ksvg_lookup.h" -@@ -56,7 +57,7 @@ - { - T *cast = dynamic_cast<T *>(element->ownerDoc()->getElementFromHandle(node.handle())); - if(cast) -- cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), Internal); -+ cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), KJS::Internal); - } - } - -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h 2004-01-17 15:52:40.000000000 +0300 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h 2004-04-21 23:41:08.040953240 +0400 -@@ -48,7 +48,7 @@ - { - public: - SVGList() { m_impl.setAutoDelete(false); } -- SVGList(const SVGList &) { *this = other; } -+ SVGList(const SVGList &other) { *this = other; } - ~SVGList() { clear(); } - - SVGList<T> &operator=(const SVGList<T> &other) -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp 2003-11-30 12:46:17.000000000 +0300 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp 2004-04-22 00:15:04.624345504 +0400 -@@ -176,7 +176,7 @@ - - CanvasPaintServer *LibartCanvas::createPaintServer(SVGElementImpl *pserver) - { -- LibartPaintServer *result; -+ LibartPaintServer *result = NULL; - if(dynamic_cast<SVGLinearGradientElementImpl *>(pserver)) - result = new LibartLinearGradient(dynamic_cast<SVGLinearGradientElementImpl *>(pserver)); - else if(dynamic_cast<SVGRadialGradientElementImpl *>(pserver)) -diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp ---- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp 2003-11-30 12:46:12.000000000 +0300 -+++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp 2004-04-22 00:48:56.135508864 +0400 -@@ -26,6 +26,7 @@ - - #include "KSVGCanvas.h" - #include "CanvasFactory.h" -+#include "CanvasItem.h" - - using namespace KSVG; - diff --git a/kde-base/kdegraphics/files/post-3.2.3-kdegraphics.diff b/kde-base/kdegraphics/files/post-3.2.3-kdegraphics.diff deleted file mode 100644 index 969f97fac84f..000000000000 --- a/kde-base/kdegraphics/files/post-3.2.3-kdegraphics.diff +++ /dev/null @@ -1,110 +0,0 @@ -Index: kpdf/xpdf/Catalog.cc -=================================================================== -RCS file: /home/kde/kdegraphics/kpdf/xpdf/Catalog.cc,v -retrieving revision 1.3 -diff -u -5 -d -p -r1.3 Catalog.cc ---- kpdf/xpdf/Catalog.cc 20 Aug 2003 21:25:12 -0000 1.3 -+++ kpdf/xpdf/Catalog.cc 18 Oct 2004 20:12:09 -0000 -@@ -61,10 +61,16 @@ Catalog::Catalog(XRef *xrefA) { - obj.getTypeName()); - goto err3; - } - pagesSize = numPages0 = obj.getInt(); - obj.free(); -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { - pages[i] = NULL; - pageRefs[i].num = -1; -@@ -188,10 +194,15 @@ int Catalog::readPageTree(Dict *pagesDic - ++start; - goto err3; - } - if (start >= pagesSize) { - pagesSize += 32; -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { - pages[j] = NULL; - pageRefs[j].num = -1; -Index: kpdf/xpdf/XRef.cc -=================================================================== -RCS file: /home/kde/kdegraphics/kpdf/xpdf/XRef.cc,v -retrieving revision 1.3 -diff -u -5 -d -p -r1.3 XRef.cc ---- kpdf/xpdf/XRef.cc 20 Aug 2003 21:25:12 -0000 1.3 -+++ kpdf/xpdf/XRef.cc 18 Oct 2004 20:12:09 -0000 -@@ -74,10 +74,16 @@ XRef::XRef(BaseStream *strA, GString *ow - return; - } - - // trailer is ok - read the xref table - } else { -+ if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) { -+ error(-1, "Invalid 'size' inside xref table."); -+ ok = gFalse; -+ errCode = errDamaged; -+ return; -+ } - entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry)); - for (i = 0; i < size; ++i) { - entries[i].offset = 0xffffffff; - entries[i].used = gFalse; - } -@@ -265,10 +271,14 @@ GBool XRef::readXRef(Guint *pos) { - } - // check for buggy PDF files with an incorrect (too small) xref - // table size - if (first + n > size) { - newSize = size + 256; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'newSize'"); -+ goto err2; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; - entries[i].used = gFalse; - } -@@ -413,10 +423,14 @@ GBool XRef::constructXRef() { - ++p; - } while (*p && isspace(*p)); - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -+ if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } - entries = (XRefEntry *) - grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; - entries[i].used = gFalse; -@@ -434,10 +448,15 @@ GBool XRef::constructXRef() { - } - - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } -+ - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } - streamEnds[streamEndsLen++] = pos; - } diff --git a/kde-base/kdegraphics/files/post-3.3.0-kdegraphics_2.diff b/kde-base/kdegraphics/files/post-3.3.0-kdegraphics_2.diff deleted file mode 100644 index 65ff45832586..000000000000 --- a/kde-base/kdegraphics/files/post-3.3.0-kdegraphics_2.diff +++ /dev/null @@ -1,115 +0,0 @@ ---- kpdf/xpdf/Catalog.cc 2003/08/20 21:25:12 1.3 -+++ kpdf/xpdf/Catalog.cc 2004/10/28 09:42:53 1.3.4.4 -@@ -12,6 +12,7 @@ - #pragma implementation - #endif - -+#include <limits.h> - #include <stddef.h> - #include "gmem.h" - #include "Object.h" -@@ -56,13 +57,22 @@ Catalog::Catalog(XRef *xrefA) { - goto err2; - } - pagesDict.dictLookup("Count", &obj); -- if (!obj.isInt()) { -+ // some PDF files actually use real numbers here ("/Count 9.0") -+ if (!obj.isNum()) { - error(-1, "Page count in top-level pages object is wrong type (%s)", - obj.getTypeName()); - goto err3; - } -- pagesSize = numPages0 = obj.getInt(); -+ pagesSize = numPages0 = (int)obj.getNum(); - obj.free(); -+ if (((unsigned) pagesSize >= INT_MAX / sizeof(Page *)) || -+ ((unsigned) pagesSize >= INT_MAX / sizeof(Ref))) -+ { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } -+ - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { -@@ -190,6 +200,11 @@ int Catalog::readPageTree(Dict *pagesDic - } - if (start >= pagesSize) { - pagesSize += 32; -+ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page*) || -+ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { -@@ -307,8 +322,8 @@ Object *Catalog::findDestInTree(Object * - } else if (cmp < 0) { - done = gTrue; - } -- name1.free(); - } -+ name1.free(); - } - names.free(); - if (!found) - ---- kpdf/xpdf/XRef.cc.orig 2004-11-04 13:08:50.000000000 +0100 -+++ kpdf/xpdf/XRef.cc 2004-11-04 13:14:50.000000000 +0100 -@@ -12,6 +12,7 @@ - #pragma implementation - #endif - -+#include <limits.h> - #include <stdlib.h> - #include <stddef.h> - #include <string.h> -@@ -76,6 +77,12 @@ - - // trailer is ok - read the xref table - } else { -+ if ((unsigned) size >= INT_MAX / sizeof(XRefEntry)) { -+ error(-1, "Invalid 'size' inside xref table."); -+ ok = gFalse; -+ errCode = errDamaged; -+ return; -+ } - entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry)); - for (i = 0; i < size; ++i) { - entries[i].offset = 0xffffffff; -@@ -267,6 +274,10 @@ - // table size - if (first + n > size) { - newSize = size + 256; -+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { -+ error(-1, "Invalid 'newSize'"); -+ goto err2; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -@@ -415,6 +426,10 @@ - if (!strncmp(p, "obj", 3)) { - if (num >= size) { - newSize = (num + 1 + 255) & ~255; -+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) { -+ error(-1, "Invalid 'obj' parameters."); -+ return gFalse; -+ } - entries = (XRefEntry *) - grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { -@@ -436,6 +451,11 @@ - } else if (!strncmp(p, "endstream", 9)) { - if (streamEndsLen == streamEndsSize) { - streamEndsSize += 64; -+ if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) { -+ error(-1, "Invalid 'endstream' parameter."); -+ return gFalse; -+ } -+ - streamEnds = (Guint *)grealloc(streamEnds, - streamEndsSize * sizeof(int)); - } diff --git a/kde-base/kdegraphics/files/post-3.3.1-kdegraphics.diff b/kde-base/kdegraphics/files/post-3.3.1-kdegraphics.diff deleted file mode 100644 index aa79feb8716e..000000000000 --- a/kde-base/kdegraphics/files/post-3.3.1-kdegraphics.diff +++ /dev/null @@ -1,42 +0,0 @@ -Index: kpdf/xpdf/Catalog.cc -=================================================================== -RCS file: /home/kde/kdegraphics/kpdf/xpdf/Catalog.cc,v -retrieving revision 1.3.4.1 -diff -u -5 -d -p -r1.3.4.1 Catalog.cc ---- kpdf/xpdf/Catalog.cc 2 Sep 2004 21:30:18 -0000 1.3.4.1 -+++ kpdf/xpdf/Catalog.cc 12 Oct 2004 21:15:38 -0000 -@@ -62,10 +62,19 @@ Catalog::Catalog(XRef *xrefA) { - obj.getTypeName()); - goto err3; - } - pagesSize = numPages0 = (int)obj.getNum(); - obj.free(); -+ // The gcc doesnt optimize this away, so this check is ok, -+ // even if it looks like a pagesSize != pagesSize check -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } -+ - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { - pages[i] = NULL; - pageRefs[i].num = -1; -@@ -189,10 +198,14 @@ int Catalog::readPageTree(Dict *pagesDic - ++start; - goto err3; - } - if (start >= pagesSize) { - pagesSize += 32; -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { - pages[j] = NULL; - pageRefs[j].num = -1; diff --git a/kde-base/kdegraphics/files/xpdf-3.3.0-kdegraphics.diff b/kde-base/kdegraphics/files/xpdf-3.3.0-kdegraphics.diff deleted file mode 100644 index 0e936cb81f5d..000000000000 --- a/kde-base/kdegraphics/files/xpdf-3.3.0-kdegraphics.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- ../../../kdegraphics-3.3.0-r1/work/kdegraphics-3.3.0/kpdf/xpdf/Catalog.cc 2003-08-20 23:25:12.000000000 +0200 -+++ kpdf/xpdf/Catalog.cc 2004-10-24 02:03:30.000000000 +0200 -@@ -56,13 +56,23 @@ - goto err2; - } - pagesDict.dictLookup("Count", &obj); -- if (!obj.isInt()) { -+ // some PDF files actually use real numbers here ("/Count 9.0") -+ if (!obj.isNum()) { - error(-1, "Page count in top-level pages object is wrong type (%s)", - obj.getTypeName()); - goto err3; - } -- pagesSize = numPages0 = obj.getInt(); -+ pagesSize = numPages0 = (int)obj.getNum(); - obj.free(); -+ // The gcc doesnt optimize this away, so this check is ok, -+ // even if it looks like a pagesSize != pagesSize check -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize || -+ pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) { -+ error(-1, "Invalid 'pagesSize'"); -+ ok = gFalse; -+ return; -+ } -+ - pages = (Page **)gmalloc(pagesSize * sizeof(Page *)); - pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref)); - for (i = 0; i < pagesSize; ++i) { -@@ -190,6 +200,10 @@ - } - if (start >= pagesSize) { - pagesSize += 32; -+ if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize) { -+ error(-1, "Invalid 'pagesSize' parameter."); -+ goto err3; -+ } - pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *)); - pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref)); - for (j = pagesSize - 32; j < pagesSize; ++j) { -@@ -307,8 +321,8 @@ - } else if (cmp < 0) { - done = gTrue; - } -- name1.free(); - } -+ name1.free(); - } - names.free(); - if (!found) |