[vlc-commits] commit: Fix segfault in preparser (Francois Cartegnie )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Apr 15 22:51:19 2010 +0200| [03542db36602e5b9bde14d11b224ec78e1a980a2] | committer: Jean-Baptiste Kempf 

Fix segfault in preparser

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 7fa10ce696573f2be5ba3684c7cdfa88021282f6)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=03542db36602e5b9bde14d11b224ec78e1a980a2
---

 src/playlist/preparser.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/playlist/preparser.c b/src/playlist/preparser.c
index 9dbc15d..64182e3 100644
--- a/src/playlist/preparser.c
+++ b/src/playlist/preparser.c
@@ -170,13 +170,15 @@ static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
         if( p_preparser->i_art_policy == ALBUM_ART_ALL &&
             ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
         {
-            msg_Dbg( p_playlist, "meta ok for %s, need to fetch art", psz_name );
+            msg_Dbg( p_playlist, "meta ok for %s, need to fetch art",
+                     psz_name ? psz_name : "(null)" );
             b_fetch = true;
         }
         else
         {
             msg_Dbg( p_playlist, "no fetch required for %s (art currently %s)",
-                     psz_name, psz_arturl );
+                     psz_name ? psz_name : "(null)",
+                     psz_arturl ? psz_arturl : "(null)" );
         }
     }
     vlc_mutex_unlock( &p_item->lock );