Fix possible overflows (bug #340167)

Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64

4 files changed, 51 insertions, 8 deletions

diff --git a/media-sound/pwavecat/ChangeLog b/media-sound/pwavecat/ChangeLog
index dc97e45b01b7..e2729c68079e 100644
--- a/media-sound/pwavecat/ChangeLog
+++ b/media-sound/pwavecat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/pwavecat
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pwavecat/ChangeLog,v 1.2 2010/07/21 00:03:38 sbriesen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pwavecat/ChangeLog,v 1.3 2011/05/07 17:22:54 angelos Exp $
+
+  07 May 2011; Christoph Mende <angelos@gentoo.org> pwavecat-0.4.5.ebuild,
+  +files/pwavecat-0.4.5-overflow.patch:
+  Fix possible overflows (bug #340167)
 
   21 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org>
   pwavecat-0.4.5.ebuild:
diff --git a/media-sound/pwavecat/Manifest b/media-sound/pwavecat/Manifest
index a1a8a9f5810a..c9d819010cbc 100644
--- a/media-sound/pwavecat/Manifest
+++ b/media-sound/pwavecat/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pwavecat-0.4.5-overflow.patch 1255 RMD160 9e6bcb4ae0526c8c831e13c2cbefc5b7745b1a77 SHA1 a72f82cecaf93aff9810bdccad515360753b3773 SHA256 f9ce887f945b4836c71a3e35ea82212f42e8c3ac97b547f10a4a379cc58463a4
 AUX pwavecat-0.4.5.diff 823 RMD160 5787ba5503cf7cc03b2e57e952cf71b368714ce5 SHA1 4eb2ed383e5ff1c943de47fe554d8f5314a00cb1 SHA256 0a8f3e9998559016b8e4b78d8fff7000815bc3bf13df15e45026d75644e0a3fa
 DIST pwavecat-0.4.5.tgz 13110 RMD160 cd335312d0339cd84df44556b2ffdd04563f7a10 SHA1 8f5d15dd7151b88571c3119e8ed55764c7ccb30a SHA256 3a7d270f09fc918ac7c78258bb99b38369744b90f2217f9f7aa30393f6467db7
-EBUILD pwavecat-0.4.5.ebuild 775 RMD160 8980fd46b42109d25eb463c22f84cc8e2411e011 SHA1 0fdb5d30c7f0694bfd929eaf3c7eaa05447f6715 SHA256 d809dfe0efc205874c9d8c0365b477575ebf3987eed3ea9847e5b86f98c5df25
-MISC ChangeLog 510 RMD160 0e734789f5fd4841c235d0659cd53afac16e715d SHA1 db4d831cb32eec416e228f0b7d1bbf44f362ff35 SHA256 ed6b64b06d6c34a14c6dcb2bfd4f5f90167a3ffc635f362cb65437ef04fd5c5b
+EBUILD pwavecat-0.4.5.ebuild 819 RMD160 13626d1104a828cdeee256ec6bafe19e79fe82ca SHA1 f71f52aad8d14d78c19eb2327cd0e34768a57c34 SHA256 0f811b6040b180c35f3bf614e620242ae9c30df22f58dc65cef28c6e500ad2e5
+MISC ChangeLog 664 RMD160 c095520d935a805a776e19e57f7d04d720b9fd09 SHA1 6d407064c70909573f83ddfdda133115044e6b02 SHA256 6b86b764754dc816b9e53482122c3fd98afd093a3733eccdc2615b102f7bdaee
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk3Ff/QACgkQmWq1bYTyC0MgdwD/W3RV2R9aiCQWMJdKS5WZtKtU
+wa4pQImj00NOdnTxOTEBALY4g/G2rEJIb8s1AIjOrs9szTTOj5LYX7lJOIs/Kike
+=d31w
+-----END PGP SIGNATURE-----
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch
new file mode 100644
index 000000000000..f3d54221bc7d
--- /dev/null
+++ b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch
@@ -0,0 +1,27 @@
+diff --git a/parts.c b/parts.c
+index 670d0d5..a59ad98 100644
+--- a/parts.c
++++ b/parts.c
+@@ -338,10 +338,10 @@ if(! file_header)
+ 	return 0;
+ 	}
+ 
+-strcpy(file_header -> main_chunk, "RIFF");
++memcpy(file_header -> main_chunk, "RIFF", 4);
+ file_header -> length = length + header_size - 8;
+-strcpy(file_header -> chunk_type, "WAVE"); 
+-strcpy(file_header -> sub_chunk, "fmt ");	// watch out the zero termination overwrites next var
++memcpy(file_header -> chunk_type, "WAVE", 4);
++memcpy(file_header -> sub_chunk, "fmt ", 4);	// watch out the zero termination overwrites next var
+ file_header -> length_chunk = 16;							//always 16
+ file_header -> format = 1;									//PCM
+ file_header -> modus = modus;								// stereo
+@@ -349,7 +349,7 @@ file_header -> sample_fq = sample_fq;						// 44100, 48000, etc...
+ file_header -> byte_p_sec = byte_p_sec;						// little endian
+ file_header -> byte_p_spl = byte_p_spl;		 				// 4 stereo
+ file_header -> bit_p_spl = bit_p_spl;						// 16 bits
+-strcpy(file_header -> data_chunk, "data");	// watch out the zero termination overwrites next var
++memcpy(file_header -> data_chunk, "data", 4);	// watch out the zero termination overwrites next var
+ file_header -> data_length = (unsigned long)length;
+ 
+ if(debug_flag)
diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
index 836e72519523..d6644e73cf9f 100644
--- a/media-sound/pwavecat/pwavecat-0.4.5.ebuild
+++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pwavecat/pwavecat-0.4.5.ebuild,v 1.2 2010/07/21 00:03:38 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pwavecat/pwavecat-0.4.5.ebuild,v 1.3 2011/05/07 17:22:54 angelos Exp $
 
 EAPI="2"
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}.diff"
+	epatch "${FILESDIR}/${P}.diff" \
+		"${FILESDIR}"/${P}-overflow.patch
 }
 
 src_compile() {
@@ -26,6 +27,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin pwavecat
+	dobin pwavecat || die
 	dodoc CHANGES README
 }