Fix mencoder segfault when used improperly, bug #23611.

7 files changed, 42 insertions, 9 deletions

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 41f9aa91527a..a09ff09e5def 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,9 +1,9 @@
-MD5 1e671c5d9deaab84cdb6177f10bf0e44 mplayer-0.90-r2.ebuild 11751
-MD5 5ba22af27d63d1522c9e2700b8d17878 ChangeLog 13648
-MD5 63ac622aa05334d340732e835dbbde5c mplayer-0.91.ebuild 11143
-MD5 2f8f33f47568f21f479a10e7e48c2c6f mplayer-0.90-r5.ebuild 11199
+MD5 8d0a05f4b6e745dab549385d12533ce7 mplayer-0.90-r2.ebuild 11750
+MD5 4939ee8d80bceb14fa1195c3b95f67f9 ChangeLog 13648
+MD5 ed46c3720c527acc6c565b2a6923e323 mplayer-0.91.ebuild 11143
+MD5 97f36b3c36b1d41fcd185f077c16e70e mplayer-0.90-r5.ebuild 11199
 MD5 c64de8680b308bfa8d3fca278235f5d3 mplayer-0.90-r4.ebuild 12157
-MD5 a0286876d6e9bb86806ae84546c4e44f mplayer-0.90_rc4.ebuild 10414
+MD5 cedc0d5a5bb2f38aa3a70c4d6b9714ea mplayer-0.90_rc4.ebuild 10413
 MD5 707fe95066bbd1ab7f2185a4b4d6e83e files/digest-mplayer-0.90-r4 363
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 611354a9a8c185e9ae1cda37d197c073 files/digest-mplayer-0.91 355
diff --git a/media-video/mplayer/files/digest-mplayer-0.90-r4 b/media-video/mplayer/files/digest-mplayer-0.90-r4
new file mode 100644
index 000000000000..b935f6eac2fe
--- /dev/null
+++ b/media-video/mplayer/files/digest-mplayer-0.90-r4
@@ -0,0 +1,5 @@
+MD5 9a9f294bbaab2071ecbc327f4e870be8 MPlayer-0.90.tar.bz2 3436463
+MD5 6c3f032ddf401ca522900291de03fee5 font-arial-iso-8859-1.tar.bz2 234810
+MD5 0f9a5d53f836e2d2d2bde207dc641044 font-arial-iso-8859-2.tar.bz2 222677
+MD5 5e12e283eeeec6125523a6f4a60d07cf default-skin-0.1.tar.bz2 167697
+MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/mencoder-segfault.patch b/media-video/mplayer/files/mencoder-segfault.patch
new file mode 100644
index 000000000000..bf20145139af
--- /dev/null
+++ b/media-video/mplayer/files/mencoder-segfault.patch
@@ -0,0 +1,16 @@
+Index: mencoder.c
+===================================================================
+RCS file: /cvsroot/mplayer/main/mencoder.c,v
+retrieving revision 1.218
+diff -u -r1.218 mencoder.c
+--- mencoder.c	13 Aug 2003 16:29:00 -0000	1.218
++++ mencoder.c	20 Aug 2003 22:34:31 -0000
+@@ -488,7 +488,7 @@
+ sh_audio=d_audio->sh;
+ sh_video=d_video->sh;
+ 
+-  if(!video_read_properties(sh_video)){
++  if(!sh_video || !video_read_properties(sh_video)){
+       printf(MSGTR_CannotReadVideoProperties);
+       mencoder_exit(1,NULL);
+   }
diff --git a/media-video/mplayer/mplayer-0.90-r2.ebuild b/media-video/mplayer/mplayer-0.90-r2.ebuild
index 466d790735d2..28a2a526f8f2 100644
--- a/media-video/mplayer/mplayer-0.90-r2.ebuild
+++ b/media-video/mplayer/mplayer-0.90-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90-r2.ebuild,v 1.4 2003/07/16 17:16:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90-r2.ebuild,v 1.5 2003/08/24 07:43:56 azarah Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb"
 
@@ -88,6 +88,9 @@ src_unpack() {
 
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch
 
+	# Fix mencoder segfaulting with bad arguments
+	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
+
 	if [ -n "`use ppc`" ]
 	then
 		# Fix mplayer to detect detect/use altivec on benh kernels,
diff --git a/media-video/mplayer/mplayer-0.90-r5.ebuild b/media-video/mplayer/mplayer-0.90-r5.ebuild
index 7575f95601e8..a925242026e4 100644
--- a/media-video/mplayer/mplayer-0.90-r5.ebuild
+++ b/media-video/mplayer/mplayer-0.90-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90-r5.ebuild,v 1.1 2003/08/09 23:20:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90-r5.ebuild,v 1.2 2003/08/24 07:43:56 azarah Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2"
 
@@ -82,6 +82,9 @@ src_unpack() {
 	# Fix head/tail call for new coreutils
 	cd ${S}; epatch ${FILESDIR}/${P}-coreutils-fixup.patch
 
+	# Fix mencoder segfaulting with bad arguments
+	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
+
 	# Fix mplayer to detect detect/use altivec on benh kernels,
 	# bug #18511.
 	use ppc && \
diff --git a/media-video/mplayer/mplayer-0.90_rc4.ebuild b/media-video/mplayer/mplayer-0.90_rc4.ebuild
index e828863f27af..5843100de509 100644
--- a/media-video/mplayer/mplayer-0.90_rc4.ebuild
+++ b/media-video/mplayer/mplayer-0.90_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_rc4.ebuild,v 1.6 2003/07/15 21:15:43 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90_rc4.ebuild,v 1.7 2003/08/24 07:43:56 azarah Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts"
 
@@ -85,6 +85,9 @@ src_unpack() {
 		epatch ${FILESDIR}/default-skin.diff
 	fi
 
+	# Fix mencoder segfaulting with bad arguments
+	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
+
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch
 }
 
diff --git a/media-video/mplayer/mplayer-0.91.ebuild b/media-video/mplayer/mplayer-0.91.ebuild
index 0a8aae707448..dbf873fd939d 100644
--- a/media-video/mplayer/mplayer-0.91.ebuild
+++ b/media-video/mplayer/mplayer-0.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.91.ebuild,v 1.1 2003/08/21 04:03:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.91.ebuild,v 1.2 2003/08/24 07:43:56 azarah Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2"
 
@@ -82,6 +82,9 @@ src_unpack() {
 	# Fix head/tail call for new coreutils
 	cd ${S}; epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
 
+	# Fix mencoder segfaulting with bad arguments
+	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
+
 	# Fix mplayer to detect detect/use altivec on benh kernels,
 	# bug #18511.
 	use ppc && \