Missing null check wrt #277845 by Thomas Eschenbacher.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 75 insertions, 9 deletions

diff --git a/media-libs/id3lib/ChangeLog b/media-libs/id3lib/ChangeLog
index a6c572be6cc5..cf954d9c1417 100644
--- a/media-libs/id3lib/ChangeLog
+++ b/media-libs/id3lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/id3lib
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.70 2008/07/29 15:04:05 yngwin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/ChangeLog,v 1.71 2009/07/16 19:18:11 ssuominen Exp $
+
+*id3lib-3.8.3-r8 (16 Jul 2009)
+
+  16 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +id3lib-3.8.3-r8.ebuild,
+  +files/id3lib-3.8.3-missing_nullpointer_check.patch:
+  Missing null check wrt #277845 by Thomas Eschenbacher.
 
 *id3lib-3.8.3-r7 (29 Jul 2008)
 
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
new file mode 100644
index 000000000000..3b9437967842
--- /dev/null
+++ b/media-libs/id3lib/files/id3lib-3.8.3-missing_nullpointer_check.patch
@@ -0,0 +1,11 @@
+--- id3lib-3.8.3/src/header_tag.cpp.orig	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/src/header_tag.cpp	2009-07-13 22:54:21.000000000 +0200
+@@ -54,7 +54,7 @@
+ {
+   size_t bytesUsed = ID3_TagHeader::SIZE;
+ 
+-  if (_info->is_extended)
++  if (_info && _info->is_extended)
+   {
+     bytesUsed += _info->extended_bytes;
+   }
diff --git a/media-libs/id3lib/id3lib-3.8.3-r7.ebuild b/media-libs/id3lib/id3lib-3.8.3-r7.ebuild
index 4446734bbc2a..a0c188c85403 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r7.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r7.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r7.ebuild,v 1.1 2008/07/29 15:04:05 yngwin Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r7.ebuild,v 1.2 2009/07/16 19:18:11 ssuominen Exp $
 
 inherit eutils autotools
 
-MY_P=${P/_/}
-S="${WORKDIR}"/${MY_P}
+MY_P=${P/_}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Id3 library for C/C++"
 HOMEPAGE="http://id3lib.sourceforge.net/"
diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
new file mode 100644
index 000000000000..7ea64b4a746b
--- /dev/null
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.3-r8.ebuild,v 1.1 2009/07/16 19:18:11 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Id3 library for C/C++"
+HOMEPAGE="http://id3lib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+RESTRICT="test"
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zlib.patch \
+		"${FILESDIR}"/${P}-test_io.patch \
+		"${FILESDIR}"/${P}-autoconf259.patch \
+		"${FILESDIR}"/${P}-doxyinput.patch \
+		"${FILESDIR}"/${P}-unicode16.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-missing_nullpointer_check.patch
+
+	# Security fix for bug 189610.
+	epatch "${FILESDIR}"/${P}-security.patch
+
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		cd doc
+		doxygen Doxyfile || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog HISTORY README THANKS TODO
+	use doc && dohtml -r doc
+}
diff --git a/media-libs/id3lib/metadata.xml b/media-libs/id3lib/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-libs/id3lib/metadata.xml
+++ b/media-libs/id3lib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>