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

playlist_song: fix user-after-free bug

Browse Source
This commit is contained in:
Max Kellermann
2012-08-15 23:57:38 +02:00
parent 9374e0f445
commit 20695ef369
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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,6 +79,9 @@ 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;
}