This commit was manufactured by cvs2svn to create tag 'RELEASE_6_4_0'.release/6.4.0

1 files changed, 0 insertions, 20 deletions

diff --git a/editors/koffice-kde4/files/patch-koffice-xpdf-CVE-2007-3387.diff b/editors/koffice-kde4/files/patch-koffice-xpdf-CVE-2007-3387.diff
deleted file mode 100644
index ded0e07205a7..000000000000
--- a/editors/koffice-kde4/files/patch-koffice-xpdf-CVE-2007-3387.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/Stream.cc
-+++ filters/kword/pdf/xpdf/xpdf/Stream.cc
-@@ -413,13 +413,11 @@ StreamPredictor::StreamPredictor(Stream 
-   predLine = NULL;
-   ok = gFalse;
- 
--  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
--     nComps >= INT_MAX / nBits ||
--      width >= INT_MAX / nComps / nBits)
--    return;
--
-   nVals = width * nComps;
--  if (nVals * nBits + 7 <= 0)
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+     nComps >= 4 || nBits > 16 ||
-+      width >= INT_MAX / nComps ||
-+      nVals >= (INT_MAX - 7) / nBits)
-     return;
- 
-   pixBytes = (nComps * nBits + 7) >> 3;