Fix segfault resulting from default skin selection. Submitted by Joel Martin <buskanaka@yahoo.com> in bug #41033

5 files changed, 33 insertions, 5 deletions

diff --git a/media-plugins/xmms-shell/ChangeLog b/media-plugins/xmms-shell/ChangeLog
index a2726b2fb8f0..508d38c277db 100644
--- a/media-plugins/xmms-shell/ChangeLog
+++ b/media-plugins/xmms-shell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/xmms-shell
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/ChangeLog,v 1.7 2004/02/08 10:58:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/ChangeLog,v 1.8 2004/02/12 05:46:34 eradicator Exp $
+
+*xmms-shell-0.99.3-r2 (11 Feb 2004)
+
+  11 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-shell-0.99.3-r1.ebuild, xmms-shell-0.99.3-r2.ebuild,
+  files/xmms-shell-null-skin.patch:
+  Fix segfault resulting from default skin selection. Submitted by Joel Martin
+  <buskanaka@yahoo.com> in bug #41033
 
   08 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-shell-0.99.3-r1.ebuild, xmms-shell-0.99.3.ebuild:
diff --git a/media-plugins/xmms-shell/Manifest b/media-plugins/xmms-shell/Manifest
index 715cbffd5c91..c8d6cd847450 100644
--- a/media-plugins/xmms-shell/Manifest
+++ b/media-plugins/xmms-shell/Manifest
@@ -1,8 +1,9 @@
+MD5 0f55db85aab3c026f8a8b316b543fcea xmms-shell-0.99.3-r2.ebuild 1307
 MD5 f20f05902899d88553f554f111a0de5b xmms-shell-0.99.0-r1.ebuild 785
-MD5 ef63a8560ec5adf46a2bb5e48fa8f9d3 ChangeLog 1839
+MD5 fe073ab167dab03448ad59a61a37ee69 ChangeLog 2147
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 8fd58abdf7c905f8238c024fb252a422 xmms-shell-0.99.3-r1.ebuild 1226
 MD5 f8b236d54106a623e0cf91e802d2af27 files/digest-xmms-shell-0.99.0-r1 68
-MD5 79d46e1306a0de2e2888d27be745a4f6 files/digest-xmms-shell-0.99.3-r1 68
+MD5 79d46e1306a0de2e2888d27be745a4f6 files/digest-xmms-shell-0.99.3-r2 68
+MD5 253375baf62ccb75c71216b4ee5a5414 files/xmms-shell-null-skin.patch 477
 MD5 30d875b5125e84fce576af17cc7ad83c files/xmms-shell-readline.patch 280
 MD5 636c67df262fad8468681da1f715ee6b files/xmms-shell-gcc3.patch 2465
diff --git a/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3-r1 b/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3-r2
index 3302688d80d5..3302688d80d5 100644
--- a/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3-r1
+++ b/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3-r2
diff --git a/media-plugins/xmms-shell/files/xmms-shell-null-skin.patch b/media-plugins/xmms-shell/files/xmms-shell-null-skin.patch
new file mode 100644
index 000000000000..0b54114e27f8
--- /dev/null
+++ b/media-plugins/xmms-shell/files/xmms-shell-null-skin.patch
@@ -0,0 +1,16 @@
+diff -ur xmms-shell-0.99.3.original/src/session.cc xmms-shell-0.99.3/src/session.cc
+--- xmms-shell-0.99.3.original/src/session.cc	2002-10-22 19:45:55.000000000 -0400
++++ xmms-shell-0.99.3/src/session.cc	2004-01-25 20:46:38.000000000 -0500
+@@ -219,7 +219,11 @@
+ {
+     ensure_running();
+ 
+-    return xmms_remote_get_skin(sid);
++    if (xmms_remote_get_skin(sid)) {
++    	return xmms_remote_get_skin(sid);
++    } else {
++    	return "";
++    }
+ }
+ 
+ #if HAVE_XMMS_REMOTE_GET_EQ
diff --git a/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild b/media-plugins/xmms-shell/xmms-shell-0.99.3-r2.ebuild
index 08f687a5410f..4f086fac7943 100644
--- a/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild
+++ b/media-plugins/xmms-shell/xmms-shell-0.99.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.3-r1.ebuild,v 1.2 2004/02/08 10:58:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.3-r2.ebuild,v 1.1 2004/02/12 05:46:34 eradicator Exp $
 
 S=${WORKDIR}/${P}
 
@@ -29,6 +29,9 @@ src_unpack() {
 	# Fix configure.in to detect readline
 	epatch ${FILESDIR}/${PN}-readline.patch
 
+	# Fix null pointer when default skin
+	epatch ${FILESDIR}/${PN}-null-skin.patch
+
 	WANT_AUTOCONF=2.1
 	WANT_AUTOMAKE=1.4
 	aclocal