db/simple: reorder checks in assert() to fix assertion failure

`light_song.Get()` could cause an assertion failure because the `Manual<>` object must not be used if uninitialized. Regression by commit ebc006ab

db/simple: reorder checks in assert() to fix assertion failure
cf2d171c · Max Kellermann · cc28a7b6 · cf2d171c · cf2d171c
Commit cf2d171c authored Feb 20, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

NEWS NEWS +2 -0

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

No files found.
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ ver 0.21.5 (not yet released)
 * protocol
  - fix deadlock in "albumart" command
  - fix "tagtypes disable" command
+* database
+  - simple: fix assertion failure
 * input
  - buffer: fix crash bug when playing remote WAV file
 * tags

--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@@ -251,7 +251,7 @@ void
 SimpleDatabase::ReturnSong(gcc_unused const LightSong *song) const noexcept
 {
 	assert(song != nullptr);
-	assert(song == &light_song.Get() || song == prefixed_light_song);
+	assert(song == prefixed_light_song || song == &light_song.Get());

 	if (prefixed_light_song != nullptr) {
 		delete prefixed_light_song;