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

playlist_song: fix potential charset bug in apply_song_metadata()

Browse Source 
The song's URI must be UTF-8, not filesystem character set.
This commit is contained in:
Max Kellermann
2012-10-05 17:01:04 +02:00
parent 72bf226608
commit 8fb20fcdf8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/playlist_song.c
View File

@@ -23,6 +23,7 @@
#include "mapper.h"
#include "song.h"
#include "uri.h"
#include "path.h"
#include "ls.h"
#include "tag.h"
@@ -62,8 +63,14 @@ apply_song_metadata(struct song *dest, const struct song *src)
if (path_fs == NULL)
return dest;
tmp = song_file_new(path_fs, NULL);
g_free(path_fs);
char *path_utf8 = fs_charset_to_utf8(path_fs);
if (path_utf8 != NULL)
g_free(path_fs);
else
path_utf8 = path_fs;
tmp = song_file_new(path_utf8, NULL);
g_free(path_utf8);
merge_song_metadata(tmp, dest, src);
} else {