From 951846c60f8a73d713441c066cc688459a012b7f Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Aug 17 2011 19:38:20 +0000
Subject: Avoid xspf NULL ptr crash in g_utf8_validate.


---

diff --git a/audacious-plugins-3.0.1-xspf.patch b/audacious-plugins-3.0.1-xspf.patch
new file mode 100644
index 0000000..cba0a50
--- /dev/null
+++ b/audacious-plugins-3.0.1-xspf.patch
@@ -0,0 +1,12 @@
+diff -Nur audacious-plugins-3.0.1-orig/src/xspf/xspf.c audacious-plugins-3.0.1/src/xspf/xspf.c
+--- audacious-plugins-3.0.1-orig/src/xspf/xspf.c	2011-08-10 16:38:22.000000000 +0200
++++ audacious-plugins-3.0.1/src/xspf/xspf.c	2011-08-17 21:33:50.315962456 +0200
+@@ -326,7 +326,7 @@
+     switch (type) {
+         case TUPLE_STRING:;
+             gchar * subst;
+-            if (is_valid_string (strVal, & subst))
++            if (strVal==NULL || is_valid_string (strVal, & subst))
+                 xmlAddChild (tmp, xmlNewText ((xmlChar *) strVal));
+             else
+             {
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 2d5646e..8c6beb4 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 3.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -31,6 +31,8 @@ Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
 #Patch1: audacious-plugins-2.4-libdir.patch
 # Fedora customization (RFE bz #632388)
 Patch2: audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch
+# reported AUDPLUG-395
+Patch3: audacious-plugins-3.0.1-xspf.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext
@@ -157,6 +159,7 @@ providers may build it with libsidplay 2 instead.
 %patch0 -p1 -b .xmms-skindir
 #patch1 -p1 -b .libdir
 %patch2 -p1 -b .enable-gnomeshortcuts
+%patch3 -p1 -b .xspf
 
 #for i in src/ladspa/ladspa.c
 #do
@@ -271,6 +274,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Aug 17 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 3.0.1-2
+- Avoid xspf NULL ptr crash in g_utf8_validate.
+
 * Thu Aug 11 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 3.0.1-1
 - Update to 3.0.1 (a fix for xspf plus translation updates).