[audacious-plugins] Fix missing newline NULL-ptr crash in m3u loader (#699107).

Michael Schwendt mschwendt at fedoraproject.org
Sat Apr 23 09:14:24 UTC 2011


commit 68691773387638ffc11fa52c6fb7cb0d751e00ac
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Apr 23 11:14:04 2011 +0200

    Fix missing newline NULL-ptr crash in m3u loader (#699107).

 audacious-plugins-2.4.5-m3u.patch |   12 ++++++++++++
 audacious-plugins.spec            |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/audacious-plugins-2.4.5-m3u.patch b/audacious-plugins-2.4.5-m3u.patch
new file mode 100644
index 0000000..da376fc
--- /dev/null
+++ b/audacious-plugins-2.4.5-m3u.patch
@@ -0,0 +1,12 @@
+diff -Nur audacious-plugins-fedora-2.4.5-orig/src/m3u/m3u.c audacious-plugins-fedora-2.4.5/src/m3u/m3u.c
+--- audacious-plugins-fedora-2.4.5-orig/src/m3u/m3u.c	2011-04-17 15:29:25.000000000 +0200
++++ audacious-plugins-fedora-2.4.5/src/m3u/m3u.c	2011-04-23 10:33:37.536322421 +0200
+@@ -86,7 +86,7 @@
+     gchar * parse = text;
+     struct index * add = index_new ();
+ 
+-    while (1)
++    while (parse)
+     {
+         gchar * next = split_line (parse);
+ 
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index e5c6359..5cc5760 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -29,6 +29,8 @@ Source2: audacious-amidi.desktop
 Patch0: audacious-plugins-2.5-alpha1-xmms-skindir.patch
 # Fedora customization: fix hardcoded libdir replacement
 Patch1: audacious-plugins-2.4-libdir.patch
+# AUDPLUG-361
+Patch2: audacious-plugins-2.4.5-m3u.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext
@@ -158,6 +160,7 @@ providers may build it with libsidplay 2 instead.
 %setup -q -n audacious-plugins-fedora-%{version}
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
+%patch2 -p1 -b .m3u-crash
 
 for i in src/ladspa/ladspa.c
 do
@@ -275,6 +278,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Apr 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-3
+- Fix missing newline NULL-ptr crash in m3u loader (#699107).
+
 * Fri Apr 22 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-2
 - Build OSS output plugin according to default.
 - Build amidi plugin according to default.


More information about the scm-commits mailing list