From 8ae5bc4d790d026a25049dd213814429ff8c8b2b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 16 Oct 2009 17:38:15 +0200 Subject: [PATCH] update: fixed memory leak during container scan The return value of map_directory_child_fs() must be freed. --- NEWS | 1 + src/update.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index af70f783b..54e0e8cc9 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ ver 0.15.5 (2009/??/??) - riff, aiff: fixed "limited range" gcc warning * decoder_thread: change the fallback decoder name to "mad" * output_thread: check again if output is open on CANCEL +* update: fixed memory leak during container scan ver 0.15.4 (2009/10/03) diff --git a/src/update.c b/src/update.c index 4aa48f25c..24960b449 100644 --- a/src/update.c +++ b/src/update.c @@ -459,17 +459,20 @@ update_container_file( struct directory* directory, while ((vtrack = plugin->container_scan(pathname, ++tnum)) != NULL) { struct song* song = song_file_new(vtrack, contdir); + char *child_path_fs; // shouldn't be necessary but it's there.. song->mtime = st->st_mtime; - song->tag = plugin->tag_dup(map_directory_child_fs(contdir, vtrack)); + child_path_fs = map_directory_child_fs(contdir, vtrack); + g_free(vtrack); + + song->tag = plugin->tag_dup(child_path_fs); + g_free(child_path_fs); songvec_add(&contdir->songs, song); modified = true; - - g_free(vtrack); } g_free(pathname);