From 7a185f1ead87d68ff0a2a002d8d5838e833f8ef9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 8 Feb 2017 09:53:14 +0100
Subject: [PATCH] queue/PlaylistUpdate: assert Database::GetSong()!=nullptr

---
 src/queue/PlaylistUpdate.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/queue/PlaylistUpdate.cxx b/src/queue/PlaylistUpdate.cxx
index 2ca4e0634..fe6942ecd 100644
--- a/src/queue/PlaylistUpdate.cxx
+++ b/src/queue/PlaylistUpdate.cxx
@@ -37,14 +37,13 @@ UpdatePlaylistSong(const Database &db, DetachedSong &song)
 	try {
 		original = db.GetSong(song.GetURI());
 	} catch (const std::runtime_error &e) {
-		return false;
-	}
-
-	if (original == nullptr)
 		/* not found - shouldn't happen, because the update
 		   thread should ensure that all stale Song instances
 		   have been purged */
 		return false;
+	}
+
+	assert(original != nullptr);
 
 	if (original->mtime == song.GetLastModified()) {
 		/* not modified */