From 80531ef8d801e3dc8e59afa1fd70d4710a80d358 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Tue, 16 Feb 2021 13:47:22 +0100
Subject: [PATCH] db/simple: fix ExportedSong move constructor for non-owning
 sources

If the constructor moves from an ExportedSong instance which refers to
somebody else's "Tag" instance, the newly constructed instance will
instead refer to its own empty "tag_buffer" field.  This broke
SimpleDatabase::GetSong(), i.e. all songs on the queue restored from
the state file or added using the "addid" command.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1089
---
 NEWS                                   |  1 +
 src/db/plugins/simple/ExportedSong.hxx | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 3bb20b3c9..8a0e7101a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 ver 0.22.6 (not yet released)
+* fix missing tags on songs in queue
 
 ver 0.22.5 (2021/02/15)
 * protocol
diff --git a/src/db/plugins/simple/ExportedSong.hxx b/src/db/plugins/simple/ExportedSong.hxx
index 37e4109b5..9a2d54a85 100644
--- a/src/db/plugins/simple/ExportedSong.hxx
+++ b/src/db/plugins/simple/ExportedSong.hxx
@@ -29,6 +29,12 @@
  * a #LightSong, e.g. a merged #Tag.
  */
 class ExportedSong : public LightSong {
+	/**
+	 * A reference target for LightSong::tag, but it is only used
+	 * if this instance "owns" the #Tag.  For instances referring
+	 * to a foreign #Tag instance (e.g. a Song::tag), this field
+	 * is not used (and empty).
+	 */
 	Tag tag_buffer;
 
 public:
@@ -42,10 +48,20 @@ public:
 	   points to this instance's #Tag field instead of leaving a
 	   dangling reference to the source object's #Tag field */
 	ExportedSong(ExportedSong &&src) noexcept
-		:LightSong(src, tag_buffer),
+		:LightSong(src,
+			   /* refer to tag_buffer only if the
+			      moved-from instance also owned the Tag
+			      which its LightSong::tag field refers
+			      to */
+			   OwnsTag() ? tag_buffer : src.tag),
 		 tag_buffer(std::move(src.tag_buffer)) {}
 
 	ExportedSong &operator=(ExportedSong &&) = delete;
+
+private:
+	bool OwnsTag() const noexcept {
+		return &tag == &tag_buffer;
+	}
 };
 
 #endif