Browse Source

koffice: Updated (1.9.99.0 -> 2.2.2)

user/amery/mess
Christian Wiese 14 years ago committed by Alejandro Mery
parent
commit
dcfacbb535
  1. 38
      kde/koffice/koffice-xpdf-CVE-2007-3387.patch
  2. 6
      kde/koffice/koffice.desc

38
kde/koffice/koffice-xpdf-CVE-2007-3387.patch

@ -1,38 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../koffice/koffice-xpdf-CVE-2007-3387.patch
# Copyright (C) 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
http://mirrors.ibiblio.org/pub/mirrors/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
--- ./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;

6
kde/koffice/koffice.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../koffice/koffice.desc
[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
@ -36,7 +36,7 @@
[L] GPL
[S] Stable
[V] 1.9.99.0
[V] 2.2.2
[P] X -----5---9 167.000
[D] 557619441 koffice-1.9.99.0.tar.bz2 ftp://ftp.kde.org/pub/kde/unstable/koffice-1.9.99.0/src/
[D] 4237236009 koffice-2.2.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/koffice-2.2.2/

Loading…
Cancel
Save