aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--NEWS2
-rw-r--r--src/playlist_print.c3
-rw-r--r--src/playlist_song.c6
3 files changed, 9 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index bda00cb29..d71fba2bb 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ ver 0.17.2 (2012/??/??)
- httpd: fix throttling bug after resuming playback
* mapper: fix non-UTF8 music directory name
* mapper: fix potential crash in file permission check
+* playlist: fix use-after-free bug
+* playlist: fix memory leak
ver 0.17.1 (2012/07/31)
diff --git a/src/playlist_print.c b/src/playlist_print.c
index 78f1cb294..204ce3582 100644
--- a/src/playlist_print.c
+++ b/src/playlist_print.c
@@ -156,6 +156,9 @@ playlist_provider_print(struct client *client, const char *uri,
song_print_info(client, song);
else
song_print_uri(client, song);
+
+ if (!song_in_database(song) || song_is_detached(song))
+ song_free(song);
}
g_free(base_uri);
diff --git a/src/playlist_song.c b/src/playlist_song.c
index 88ef1059d..29efef2e3 100644
--- a/src/playlist_song.c
+++ b/src/playlist_song.c
@@ -69,7 +69,6 @@ apply_song_metadata(struct song *dest, const struct song *src)
} else {
tmp = song_file_new(dest->uri, NULL);
merge_song_metadata(tmp, dest, src);
- song_free(dest);
}
if (dest->tag != NULL && dest->tag->time > 0 &&
@@ -80,11 +79,14 @@ apply_song_metadata(struct song *dest, const struct song *src)
(e.g. last track on a CUE file); fix it up here */
tmp->tag->time = dest->tag->time - src->start_ms / 1000;
+ if (!song_in_database(dest))
+ song_free(dest);
+
return tmp;
}
static struct song *
-playlist_check_load_song(struct song *song, const char *uri, bool secure)
+playlist_check_load_song(const struct song *song, const char *uri, bool secure)
{
struct song *dest;