db/simple: fix crash when mounting twice

The `db->close()` call was a `nullptr` dereference because the `db` variable had already been moved. Closes https://github.com/MusicPlayerDaemon/MPD/issues/839

db/simple: fix crash when mounting twice
209364ad · Max Kellermann · 24afdee3 · 209364ad · 209364ad
Commit 209364ad authored May 05, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

NEWS NEWS +2 -0

SimpleDatabasePlugin.cxx src/db/plugins/simple/SimpleDatabasePlugin.cxx +1 -6

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.24 (not yet released)
 * protocol
  - "tagtypes" requires no permissions
+* database
+  - simple: fix crash when mounting twice
 * fix unit test failure

 ver 0.21.23 (2020/04/23)

--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@@ -449,12 +449,7 @@ SimpleDatabase::Mount(const char *local_uri, const char *storage_uri)

 	// TODO: update the new database instance?

-	try {
-		Mount(local_uri, std::move(db));
-	} catch (...) {
-		db->Close();
-		throw;
-	}
+	Mount(local_uri, std::move(db));
 }

 inline DatabasePtr