oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.17.x'

This commit is contained in:
Max Kellermann 2012-08-16 00:04:03 +02:00
parent e391f4b17b ef5125f8f4
commit f45616e5f6
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -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)

3
src/playlist_print.c
View File

@ -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);

6
src/playlist_song.c
View File

@ -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;