fix for xpdf makeFileKey2 stack overflow, #78619

Package-Manager: portage-2.0.51-r15

5 files changed, 63 insertions, 2 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index b1af859cd00a..b51eb776e6ee 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.2 2005/01/29 16:31:08 carlo Exp $
+
+*kpdf-3.4.0_beta1-r1 (29 Jan 2005)
+
+  29 Jan 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/CAN-2005-0064_kde-3.4.patch, +kpdf-3.4.0_beta1-r1.ebuild:
+  fix for xpdf makeFileKey2 stack overflow, #78619
 
 *kpdf-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index a33280240928..950d1b4affc9 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -1,4 +1,7 @@
 MD5 87a7a01624e046fb0ffb72806085e6ee kpdf-3.4.0_beta1.ebuild 412
-MD5 051d30a7c901bd28fd364e5604fdfd6c ChangeLog 432
+MD5 965d146caf88834610699110eca92ac2 kpdf-3.4.0_beta1-r1.ebuild 497
+MD5 37c1dc847f9e300280dd4300cdcf5fd4 ChangeLog 633
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 c8894012c11807a905fa8928fc304aab files/CAN-2005-0064_kde-3.4.patch 803
+MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kpdf-3.4.0_beta1-r1 225
 MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kpdf-3.4.0_beta1 225
diff --git a/kde-base/kpdf/files/CAN-2005-0064_kde-3.4.patch b/kde-base/kpdf/files/CAN-2005-0064_kde-3.4.patch
new file mode 100644
index 000000000000..bd14ca666cd6
--- /dev/null
+++ b/kde-base/kpdf/files/CAN-2005-0064_kde-3.4.patch
@@ -0,0 +1,31 @@
+--- kpdf/xpdf/xpdf/Decrypt.cc.jn	2002-12-06 00:44:32.000000000 +0100
++++ kpdf/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/kde-base/kpdf/files/digest-kpdf-3.4.0_beta1-r1 b/kde-base/kpdf/files/digest-kpdf-3.4.0_beta1-r1
new file mode 100644
index 000000000000..61aba8b28ff3
--- /dev/null
+++ b/kde-base/kpdf/files/digest-kpdf-3.4.0_beta1-r1
@@ -0,0 +1,3 @@
+MD5 701a5fe0bfc6ec26d8a50f72334d2b2a kdegraphics-3.3.90.tar.bz2 6307655
+MD5 0d5a081c948e50234ebe27075941f1c9 kdegraphics-3.3.90-3.3.91.tar.xdelta 562657
+MD5 e819ff09157f1bf83c6a1ac70ab41439 kdegraphics-3.3.91.tar.bz2 6455135
diff --git a/kde-base/kpdf/kpdf-3.4.0_beta1-r1.ebuild b/kde-base/kpdf/kpdf-3.4.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..316e74b97c0f
--- /dev/null
+++ b/kde-base/kpdf/kpdf-3.4.0_beta1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.0_beta1-r1.ebuild,v 1.1 2005/01/29 16:31:08 carlo Exp $
+
+KMNAME=kdegraphics
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
+KEYWORDS="~x86"
+IUSE=""
+KMEXTRA="kfile-plugins/pdf"
+
+src_unpack(){
+	kde-meta_src_unpack
+	epatch ${FILESDIR}/CAN-2005-0064_kde-3.4.patch
+}
\ No newline at end of file