directory_save: duplicate the playlist name

The function playlist_metadata_load() will overwrite the input buffer before using the "name" parameter; since "name" points to the same buffer, we'll get a corrupted string.

directory_save: duplicate the playlist name
7820ebb8 · Max Kellermann · 31ab0b3d · 7820ebb8
Commit 7820ebb8 authored Jul 25, 2010 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

directory_save.c src/directory_save.c +9 -2

No files found.
--- a/src/directory_save.c
+++ b/src/directory_save.c
@@ -172,11 +172,18 @@ directory_load(FILE *fp, struct directory *directory,

 			songvec_add(&directory->songs, song);
 		} else if (g_str_has_prefix(line, PLAYLIST_META_BEGIN)) {
-			const char *name = line + sizeof(PLAYLIST_META_BEGIN) - 1;
+			/* duplicate the name, because
+			   playlist_metadata_load() will overwrite the
+			   buffer */
+			char *name = g_strdup(line + sizeof(PLAYLIST_META_BEGIN) - 1);

 			if (!playlist_metadata_load(fp, &directory->playlists,
-						    name, buffer, error))
+						    name, buffer, error)) {
+				g_free(name);
 				return false;
+			}
+
+			g_free(name);
 		} else {
 			g_set_error(error, directory_quark(), 0,
 				    "Malformed line: %s", line);