summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2005-01-21 17:40:00 +0000
committerCarsten Lohrke <carlo@gentoo.org>2005-01-21 17:40:00 +0000
commitfebf36ef33d43ff216406384deda823787a0238c (patch)
tree15c30cee5f7714ef6c037443fcb8cf4654d4d610 /app-office/koffice/files
parentuse.mask mzscheme, bug 65216 (diff)
downloadgentoo-2-febf36ef33d43ff216406384deda823787a0238c.tar.gz
gentoo-2-febf36ef33d43ff216406384deda823787a0238c.tar.bz2
gentoo-2-febf36ef33d43ff216406384deda823787a0238c.zip
clean up
(Portage version: 2.0.51-r14)
Diffstat (limited to 'app-office/koffice/files')
-rw-r--r--app-office/koffice/files/digest-koffice-1.3.3-r21
-rw-r--r--app-office/koffice/files/digest-koffice-1.3.4-r11
-rw-r--r--app-office/koffice/files/digest-koffice-1.3.51
-rw-r--r--app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff90
-rw-r--r--app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff76
5 files changed, 0 insertions, 169 deletions
diff --git a/app-office/koffice/files/digest-koffice-1.3.3-r2 b/app-office/koffice/files/digest-koffice-1.3.3-r2
deleted file mode 100644
index 8c8f121cb5f5..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c3b745c6218a9dc9b3f60edea2dca2b koffice-1.3.3.tar.bz2 10739168
diff --git a/app-office/koffice/files/digest-koffice-1.3.4-r1 b/app-office/koffice/files/digest-koffice-1.3.4-r1
deleted file mode 100644
index 27aee10e0979..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924
diff --git a/app-office/koffice/files/digest-koffice-1.3.5 b/app-office/koffice/files/digest-koffice-1.3.5
deleted file mode 100644
index 4835c6338154..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
diff --git a/app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff b/app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff
deleted file mode 100644
index 449806bd4fdb..000000000000
--- a/app-office/koffice/files/koffice_1_3_4_xpdf_security_integer_overflow.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: Catalog.cc
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v
-retrieving revision 1.1.2.1
-retrieving revision 1.1.2.4
-diff -u -p -r1.1.2.1 -r1.1.2.4
---- filters/kword/pdf/xpdf/xpdf/Catalog.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4
-@@ -12,6 +12,7 @@
- #pragma implementation
- #endif
-
-+#include <limits.h>
- #include <stddef.h>
- #include "gmem.h"
- #include "Object.h"
-@@ -63,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) {
- }
- pagesSize = numPages0 = obj.getInt();
- obj.free();
-- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) ||
-+ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) {
- error(-1, "Invalid 'pagesSize'");
- ok = gFalse;
- return;
-@@ -196,8 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic
- }
- if (start >= pagesSize) {
- pagesSize += 32;
-- if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-- pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
-+ if ((unsigned) pagesSize >= INT_MAX / sizeof(Page *) ||
-+ (unsigned) pagesSize >= INT_MAX / sizeof(Ref)) {
- error(-1, "Invalid 'pagesSize' parameter.");
- goto err3;
- }
-Index: XRef.cc
-===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
-retrieving revision 1.1.2.1
-retrieving revision 1.1.2.4
-diff -u -p -r1.1.2.1 -r1.1.2.4
---- filters/kword/pdf/xpdf/xpdf/XRef.cc 22 Oct 2004 12:13:56 -0000 1.1.2.1
-+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:43:47 -0000 1.1.2.4
-@@ -12,6 +12,7 @@
- #pragma implementation
- #endif
-
-+#include <limits.h>
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-@@ -76,7 +77,7 @@ XRef::XRef(BaseStream *strA, GString *ow
-
- // trailer is ok - read the xref table
- } else {
-- if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+ if ((unsigned) size >= INT_MAX / sizeof(XRefEntry)) {
- error(-1, "Invalid 'size' inside xref table.");
- ok = gFalse;
- errCode = errDamaged;
-@@ -273,7 +274,7 @@ GBool XRef::readXRef(Guint *pos) {
- // table size
- if (first + n > size) {
- newSize = size + 256;
-- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) {
- error(-1, "Invalid 'newSize'");
- goto err2;
- }
-@@ -420,7 +421,7 @@ GBool XRef::constructXRef() {
- if (!strncmp(p, "obj", 3)) {
- if (num >= size) {
- newSize = (num + 1 + 255) & ~255;
-- if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+ if ((unsigned) newSize >= INT_MAX / sizeof(XRefEntry)) {
- error(-1, "Invalid 'obj' parameters.");
- return gFalse;
- }
-@@ -445,7 +446,7 @@ GBool XRef::constructXRef() {
- } else if (!strncmp(p, "endstream", 9)) {
- if (streamEndsLen == streamEndsSize) {
- streamEndsSize += 64;
-- if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) {
-+ if ((unsigned) streamEndsSize >= INT_MAX / sizeof(int)) {
- error(-1, "Invalid 'endstream' parameter.");
- return gFalse;
- }
diff --git a/app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff b/app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff
deleted file mode 100644
index 2a9490640ec7..000000000000
--- a/app-office/koffice/files/xpdf-CESA-2004-007-xpdf2-newer.diff
+++ /dev/null
@@ -1,76 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/XRef.cc.orig 2004-09-17 23:54:38.000000000 -0700
-+++ filters/kword/pdf/xpdf/xpdf/XRef.cc 2004-09-25 17:59:36.000000000 -0700
-@@ -76,6 +76,12 @@
-
- // 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;
-@@ -267,6 +273,10 @@
- // 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;
-@@ -410,6 +420,10 @@
- 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) {
-@@ -431,6 +445,11 @@
- } 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));
- }
---- filters/kword/pdf/xpdf/xpdf/Catalog.cc.orig 2004-10-18 16:26:39.388666476 +0200
-+++ filters/kword/pdf/xpdf/xpdf/Catalog.cc 2004-10-18 16:27:28.004749073 +0200
-@@ -62,6 +62,12 @@
- }
- 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) {
-@@ -186,6 +192,11 @@
- }
- 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) {