[audacious-plugins/f15] Fix m3u playlist load corruption (AUDPLUG-380).

[Michael Schwendt]

commit 2f3328e968e193fce5aa32c80d11ae178aa23837
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jul 3 01:05:13 2011 +0200

    Fix m3u playlist load corruption (AUDPLUG-380).

 audacious-plugins-2.5.2-m3u-eof.patch |   18 ++++++++++++++++++
 audacious-plugins.spec                |    8 +++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/audacious-plugins-2.5.2-m3u-eof.patch b/audacious-plugins-2.5.2-m3u-eof.patch
new file mode 100644
index 0000000..d20da1e
--- /dev/null
+++ b/audacious-plugins-2.5.2-m3u-eof.patch
@@ -0,0 +1,18 @@
+diff -Nur audacious-plugins-2.5.2-orig/src/m3u/m3u.c audacious-plugins-2.5.2/src/m3u/m3u.c
+--- audacious-plugins-2.5.2-orig/src/m3u/m3u.c	2011-06-20 03:14:25.000000000 +0200
++++ audacious-plugins-2.5.2/src/m3u/m3u.c	2011-07-03 01:02:42.530825921 +0200
+@@ -51,8 +51,13 @@
+     if (raw == NULL)
+         return NULL;
+ 
+-    gchar * text = str_to_utf8 (raw);
++    gchar * terminated = g_memdup (raw,size+1);
+     g_free (raw);
++    if (terminated == NULL)
++        return NULL;
++    terminated[size] = 0;
++    gchar * text = str_to_utf8 (terminated);
++    g_free (terminated);
+     strip_char (text, '\r');
+     return text;
+ }
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 63f1689..0d1e3d9 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -31,6 +31,8 @@ Patch0: audacious-plugins-2.5.2-xmms-skindir.patch
 Patch1: audacious-plugins-2.4-libdir.patch
 # up to git on 20110628
 Patch2: audacious-plugins-2.5.2-git20110628.patch
+# reported, AUDPLUG-380
+Patch3: audacious-plugins-2.5.2-m3u-eof.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext
@@ -156,6 +158,7 @@ providers may build it with libsidplay 2 instead.
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .git-20110628
+%patch3 -p1 -b .m3u-eof
 
 for i in src/ladspa/ladspa.c
 do
@@ -270,6 +273,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sun Jul  3 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.2-3
+- Fix m3u playlist load corruption (AUDPLUG-380).
+
 * Wed Jun 29 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.2-2
 - Merge cue playlist load fix from git.