Fix for overflow bug in size calculation by Hendrik Iben wrt #211289.

(Portage version: 2.1.4.4)

3 files changed, 69 insertions, 2 deletions

diff --git a/media-libs/libtimidity/ChangeLog b/media-libs/libtimidity/ChangeLog
index c7e36f039ec2..0a25d204ce90 100644
--- a/media-libs/libtimidity/ChangeLog
+++ b/media-libs/libtimidity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libtimidity
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtimidity/ChangeLog,v 1.11 2007/12/05 15:45:55 fmccor Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtimidity/ChangeLog,v 1.12 2008/02/24 18:43:11 drac Exp $
+
+*libtimidity-0.1.0-r1 (24 Feb 2008)
+
+  24 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  +files/libtimidity-0.1.0-newlen-overflow.patch,
+  +libtimidity-0.1.0-r1.ebuild:
+  Fix for overflow bug in size calculation by Hendrik Iben wrt #211289.
 
   05 Dec 2007; Ferris McCormick <fmccor@gentoo.org>
   libtimidity-0.1.0.ebuild:
diff --git a/media-libs/libtimidity/files/libtimidity-0.1.0-newlen-overflow.patch b/media-libs/libtimidity/files/libtimidity-0.1.0-newlen-overflow.patch
new file mode 100644
index 000000000000..22952a5ebba1
--- /dev/null
+++ b/media-libs/libtimidity/files/libtimidity-0.1.0-newlen-overflow.patch
@@ -0,0 +1,22 @@
+diff -Naur libtimidity-0.1.0/src/resample.c libtimidity-0.1.0-r1/src/resample.c
+--- libtimidity-0.1.0/src/resample.c	2004-11-21 23:02:53.000000000 +0100
++++ libtimidity-0.1.0-r1/src/resample.c	2008-02-24 18:46:36.000000000 +0100
+@@ -545,7 +545,8 @@
+ void pre_resample(MidSong *song, MidSample *sp)
+ {
+   double a, xdiff;
+-  sint32 incr, ofs, newlen, count;
++  sint32 incr, ofs, count;
++  unsigned int newlen;
+   sint16 *newdata, *dest, *src = (sint16 *) sp->data;
+   sint16 v1, v2, v3, v4, *vptr;
+ #ifdef DEBUG_CHATTER
+@@ -561,7 +562,7 @@
+ 
+   a = ((double) (sp->sample_rate) * freq_table[(int) (sp->note_to_use)]) /
+     ((double) (sp->root_freq) * song->rate);
+-  newlen = (sint32)(sp->data_length / a);
++  newlen = (unsigned int)(sp->data_length / a);
+   dest = newdata = safe_malloc(newlen >> (FRACTION_BITS - 1));
+ 
+   count = (newlen >> FRACTION_BITS) - 1;
diff --git a/media-libs/libtimidity/libtimidity-0.1.0-r1.ebuild b/media-libs/libtimidity/libtimidity-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..5bdb9d48f495
--- /dev/null
+++ b/media-libs/libtimidity/libtimidity-0.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtimidity/libtimidity-0.1.0-r1.ebuild,v 1.1 2008/02/24 18:43:11 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="MIDI to WAVE converter library"
+HOMEPAGE="http://libtimidity.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ao debug"
+
+RDEPEND="ao? ( media-libs/libao )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-newlen-overflow.patch
+	epatch "${FILESDIR}"/${P}-automagic.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf --disable-aotest $(use_enable ao) $(use_enable debug)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog CHANGES NEWS TODO README*
+}