fix for xpdf buffer overflow, #75203

4 files changed, 66 insertions, 1 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 16b02ddcf4ba..1095a8427068 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.81 2004/12/21 19:22:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.82 2004/12/22 19:45:09 carlo Exp $
+
+*koffice-1.3.5-r1 (22 Dec 2004)
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/koffice_1_3_xpdf_buffer_overflow.diff, +koffice-1.3.5-r1.ebuild:
+  fix for xpdf buffer overflow, #75203
 
   21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> koffice-1.3.5.ebuild:
   Stable on alpha.
 
+*koffice-1.3.5-r1 (22 Dec 2004)
+
+  22 Dec 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/koffice_1_3_xpdf_buffer_overflow.diff, +koffice-1.3.5-r1.ebuild:
+  fix for xpdf buffer overflow, #75203
+
   15 Dec 2004; Dylan Carlson <absinthe@gentoo.org> koffice-1.3.5.ebuild:
   Stable on amd64.
 
diff --git a/app-office/koffice/files/digest-koffice-1.3.5-r1 b/app-office/koffice/files/digest-koffice-1.3.5-r1
new file mode 100644
index 000000000000..4835c6338154
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.3.5-r1
@@ -0,0 +1 @@
+MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
diff --git a/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
new file mode 100644
index 000000000000..b808182c86cc
--- /dev/null
+++ b/app-office/koffice/files/koffice_1_3_xpdf_buffer_overflow.diff
@@ -0,0 +1,18 @@
+===================================================================
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cc,v
+retrieving revision 1.3
+retrieving revision 1.3.2.1
+diff -u -r1.3 -r1.3.2.1
+--- filters/kword/pdf/xpdf/xpdf/Gfx.cc	2003/01/25 23:17:44	1.3
++++ filters/kword/pdf/xpdf/xpdf/Gfx.cc	2004/12/22 12:07:12	1.3.2.1
+@@ -2379,7 +2379,9 @@
+     haveMask = gFalse;
+     dict->lookup("Mask", &maskObj);
+     if (maskObj.isArray()) {
+-      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
++      for (i = 0;
++	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
++	   ++i) {
+ 	maskObj.arrayGet(i, &obj1);
+ 	maskColors[i] = obj1.getInt();
+ 	obj1.free();
diff --git a/app-office/koffice/koffice-1.3.5-r1.ebuild b/app-office/koffice/koffice-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..e7424400a1bf
--- /dev/null
+++ b/app-office/koffice/koffice-1.3.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.5-r1.ebuild,v 1.1 2004/12/22 19:45:09 carlo Exp $
+
+inherit kde eutils
+
+# TODO : mysql support
+# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
+
+DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc ~alpha ~ppc64"
+
+IUSE=""
+SLOT="0"
+
+DEPEND=">=dev-lang/python-2.2.1
+	>=media-libs/libart_lgpl-2.3.9
+	>=media-gfx/imagemagick-5.4.5
+	>=app-text/wv2-0.1.8
+	dev-util/pkgconfig"
+need-kde 3.1
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/koffice_1_3_xpdf_buffer_overflow.diff
+}
+src_compile() {
+	export LIBPYTHON="`python-config --libs`"
+	kde_src_compile
+}