Bug#705899: Audacious: regresion reading m3u files with empty lines

[Ferran Jorba]

Package: audacious
Version: 3.2.4-1
Severity: important
Tags: patch

Dear Maintainer,

audacious in Wheezy (3.2,4) has a regresion when reading m3u files with
empty files.  Lenny version handled them perfectly.  There is a patch
upstream that can easily applied to 3.2.4 that fixes it.  The full
report, along with the supplied patch, can be read at

http://redmine.audacious-media-player.org/boards/1/topics/662

Many internet radios contain those empty lines.  Releasing Wheezy
without this patch is a severe regression of the package.

Thanks for your job,

Ferran

---
 src/m3u/m3u.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: audacious-plugins-3.2.4/src/m3u/m3u.c
===================================================================
--- audacious-plugins-3.2.4.orig/src/m3u/m3u.c	2012-06-30 02:05:33.000000000 +0200
+++ audacious-plugins-3.2.4/src/m3u/m3u.c	2013-04-02 21:55:12.042709904 +0200
@@ -61,8 +61,11 @@
     if (! feed)
         return NULL;
 
-    * feed = 0;
-    return feed + 1;
+    * feed++ = 0;
+    if (*feed)
+        return feed;
+    else
+        return NULL;
 }
 
 static gboolean playlist_load_m3u (const gchar * path, VFSFile * file,
@@ -83,10 +86,7 @@
         while (* parse == ' ' || * parse == '\t')
             parse ++;
 
-        if (! * parse)
-            break;
-
-        if (* parse == '#')
+        if (* parse == '#' || *parse=='\0')
             goto NEXT;
 
         gchar * s = aud_construct_uri (parse, path);

-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages audacious depends on:
ii  audacious-plugins    3.2.4-1
ii  dbus                 1.6.8-1
ii  dbus-x11             1.6.8-1
ii  gtk2-engines-pixbuf  2.24.10-2
ii  libaudclient2        3.2.4-1
ii  libaudcore1          3.2.4-1
ii  libc6                2.13-38
ii  libdbus-1-3          1.6.8-1
ii  libdbus-glib-1-2     0.100.2-1
ii  libgdk-pixbuf2.0-0   2.26.1-1
ii  libglib2.0-0         2.33.12+really2.32.4-5
ii  libgtk-3-0           3.4.2-6
ii  libguess1            1.1-1
ii  libice6              2:1.0.8-2
ii  libsm6               2:1.2.1-2

Versions of packages audacious recommends:
ii  unzip  6.0-8

audacious suggests no packages.