aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-05-09 18:03:45 +0200
committerMax Kellermann <max@duempel.org>2011-05-09 18:03:54 +0200
commit9402b23dd5f75388cb48fdf04ca62033dfc6709a (patch)
tree88d04f8cafbca586564321427d66a1f44c9b0699
parent246db3d5652bb7289b1a1ab255dfdb67e0fa260e (diff)
downloadmpd-9402b23dd5f75388cb48fdf04ca62033dfc6709a.tar.gz
mpd-9402b23dd5f75388cb48fdf04ca62033dfc6709a.tar.xz
mpd-9402b23dd5f75388cb48fdf04ca62033dfc6709a.zip
playlist_song: fix NULL pointer dereference
-rw-r--r--NEWS1
-rw-r--r--src/playlist_song.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 05b9d86fa..9dab437d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
ver 0.16.3 (2011/??/??)
* fix assertion failure in audio format mask parser
+* fix NULL pointer dereference in playlist parser
* decoder:
- ffmpeg: support libavcodec 0.7
diff --git a/src/playlist_song.c b/src/playlist_song.c
index 1e8e98795..2ad63c913 100644
--- a/src/playlist_song.c
+++ b/src/playlist_song.c
@@ -129,7 +129,7 @@ playlist_check_translate_song(struct song *song, const char *base_uri)
else
uri = g_strdup(uri);
- if (uri_has_scheme(base_uri)) {
+ if (uri_has_scheme(uri)) {
dest = song_remote_new(uri);
g_free(uri);
} else {