db/SimpleDatabasePlugin: fix memory leak in Visit()

When visiting a song, GetSong() was called, but this object was never returned by calling ReturnSong(). This patch locks the database only once in Visit() and passes the original song object to the visitor, avoiding the copy.

db/SimpleDatabasePlugin: fix memory leak in Visit()
886255e3 · Max Kellermann · 0240e754 · 886255e3
Commit 886255e3 authored Sep 05, 2012 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 7 deletions

SimpleDatabasePlugin.cxx src/db/SimpleDatabasePlugin.cxx +11 -7

No files found.
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/SimpleDatabasePlugin.cxx
@@ -261,13 +261,18 @@ SimpleDatabase::Visit(const DatabaseSelection &selection,
 		      VisitPlaylist visit_playlist,
 		      GError **error_r) const
 {
-	const struct directory *directory = LookupDirectory(selection.uri);
+	ScopeDatabaseLock protect;
+
+	const struct directory *directory =
+		directory_lookup_directory(root, selection.uri);
 	if (directory == NULL) {
-		struct song *song;
-		if (visit_song &&
-		    (song = GetSong(selection.uri, NULL)) != NULL &&
-		    selection.Match(*song))
-			return visit_song(*song, error_r);
+		if (visit_song) {
+			struct song *song =
+				directory_lookup_song(root, selection.uri);
+			if (song != nullptr)
+				return !selection.Match(*song) ||
+					visit_song(*song, error_r);
+		}

 		g_set_error(error_r, db_quark(), DB_NOT_FOUND,
 			    "No such directory");
@@ -278,7 +283,6 @@ SimpleDatabase::Visit(const DatabaseSelection &selection,
 	    !visit_directory(*directory, error_r))
 		return false;

-	ScopeDatabaseLock protect;
 	return directory->Walk(selection.recursive, selection.filter,
 			       visit_directory, visit_song, visit_playlist,
 			       error_r);