From e8df7e8da5a075178224b130c0602b62c85508a9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 22 Aug 2012 21:40:20 +0200 Subject: Database*: fix nullptr dereference when no database is configured --- src/DatabasePlaylist.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/DatabasePlaylist.cxx') diff --git a/src/DatabasePlaylist.cxx b/src/DatabasePlaylist.cxx index c6ad9c54..69d87dfd 100644 --- a/src/DatabasePlaylist.cxx +++ b/src/DatabasePlaylist.cxx @@ -43,11 +43,15 @@ search_add_to_playlist(const char *uri, const char *playlist_path_utf8, const struct locate_item_list *criteria, GError **error_r) { + const Database *db = GetDatabase(error_r); + if (db == nullptr) + return false; + const DatabaseSelection selection(uri, true, criteria); using namespace std::placeholders; const auto f = std::bind(AddSong, playlist_path_utf8, _1, _2); - return GetDatabase()->Visit(selection, f, error_r); + return db->Visit(selection, f, error_r); } bool -- cgit v1.2.3