fix for xpdf makeFileKey2 stack overflow, #78620

5 files changed, 84 insertions, 8 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index c6a5380b6b62..bcff1644c6dd 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.90 2005/01/02 21:41:37 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.91 2005/01/19 12:41:55 carlo Exp $
+
+*koffice-1.3.5-r2 (19 Jan 2005)
+
+  19 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +files/CAN-2005-0064.patch,
+  +koffice-1.3.5-r2.ebuild:
+  fix for xpdf makeFileKey2 stack overflow, #78620
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index d35347cbdc13..8292f6614860 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,13 +1,16 @@
-MD5 4520ab63f85bcba11a8b143871560773 ChangeLog 12681
-MD5 4feb9abecb385306069e098bfed829b5 koffice-1.3.3-r2.ebuild 1153
 MD5 5e43f1b06367878a5a3a497d8597e0b5 koffice-1.3.5-r1.ebuild 982
-MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
-MD5 bd355e70e5d8ee68469bbdaf12a8922c koffice-1.3.5.ebuild 923
+MD5 4feb9abecb385306069e098bfed829b5 koffice-1.3.3-r2.ebuild 1153
 MD5 8248ca43da774ec432966e07d6f1b530 koffice-1.3.4-r1.ebuild 994
+MD5 bd355e70e5d8ee68469bbdaf12a8922c koffice-1.3.5.ebuild 923
+MD5 262203c116ebe3f4de8a2316f72f7b7e ChangeLog 12871
+MD5 96a4184e1e3325923219a5f96a5511a5 metadata.xml 163
+MD5 d9bb0ef13a6a599e097d53c84c616444 koffice-1.3.5-r2.ebuild 919
 MD5 20d32402fa6f6883dccb63cf1826a15f files/koffice_1_3_4_xpdf_security_integer_overflow.diff 3393
-MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5 68
-MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r1 68
-MD5 4736559193af7398788799098e16c3c8 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2828
+MD5 6ee3768e50296eb2a8158093ee518133 files/CAN-2005-0064.patch 829
 MD5 77399be6733ffca4ed1142ab319c1453 files/koffice_1_3_xpdf_buffer_overflow.diff 1808
+MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5 68
 MD5 e5a6ea2ef1815721c7773577378931a2 files/digest-koffice-1.3.3-r2 68
 MD5 d261da2eaab2f46cd2f06609e5f41885 files/digest-koffice-1.3.4-r1 68
+MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r1 68
+MD5 12452317cab5461eb911114062f2cce2 files/digest-koffice-1.3.5-r2 68
+MD5 4736559193af7398788799098e16c3c8 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2828
diff --git a/app-office/koffice/files/CAN-2005-0064.patch b/app-office/koffice/files/CAN-2005-0064.patch
new file mode 100644
index 000000000000..e50d23259f6c
--- /dev/null
+++ b/app-office/koffice/files/CAN-2005-0064.patch
@@ -0,0 +1,31 @@
+--- filters/kword/pdf/xpdf/xpdf/Decrypt.cc.jn	2002-12-06 00:44:32.000000000 +0100
++++ filters/kword/pdf/xpdf/xpdf/Decrypt.cc	2005-01-14 13:38:48.192647128 +0100
+@@ -132,13 +132,19 @@ GBool Decrypt::makeFileKey2(int encVersi
+   Guchar *buf;
+   Guchar test[32];
+   Guchar fState[256];
+-  Guchar tmpKey[16];
++  Guchar *tmpKey;
+   Guchar fx, fy;
+   int len, i, j;
+   GBool ok;
+ 
++  // check whether we have non-zero keyLength
++  if ( !keyLength ) {
++    return gFalse;
++  }
++  
+   // generate file key
+   buf = (Guchar *)gmalloc(68 + fileID->getLength());
++  tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar));
+   if (userPassword) {
+     len = userPassword->getLength();
+     if (len < 32) {
+@@ -191,6 +197,7 @@ GBool Decrypt::makeFileKey2(int encVersi
+     ok = gFalse;
+   }
+ 
++  gfree(tmpKey);
+   gfree(buf);
+   return ok;
+ }
diff --git a/app-office/koffice/files/digest-koffice-1.3.5-r2 b/app-office/koffice/files/digest-koffice-1.3.5-r2
new file mode 100644
index 000000000000..4835c6338154
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.3.5-r2
@@ -0,0 +1 @@
+MD5 dbc7e76c86647709a3e74f57c0fcf7f5 koffice-1.3.5.tar.bz2 10778584
diff --git a/app-office/koffice/koffice-1.3.5-r2.ebuild b/app-office/koffice/koffice-1.3.5-r2.ebuild
new file mode 100644
index 000000000000..68ed61dfcd94
--- /dev/null
+++ b/app-office/koffice/koffice-1.3.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/01/19 12:41:55 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
+	epatch ${FILESDIR}/CAN-2005-0064.patch
+}
+src_compile() {
+	export LIBPYTHON="`python-config --libs`"
+	kde_src_compile
+}