d4d06da2f8
After commit 1afa33c3c7, an old bug was revealed:
SimpleDatabase::GetSong() constructs an ExportedSong instance by
moving the return value of Song::Export(), which causes the
LightSong::tag field to be dangling on the moved-from
ExportedSong::tag_buffer. This broke tags from CUE sheets.
Closes https://github.com/MusicPlayerDaemon/MPD/issues/1070
52 lines
1.7 KiB
C++
52 lines
1.7 KiB
C++
/*
|
|
* Copyright 2003-2021 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPD_DB_SIMPLE_EXPORTED_SONG_HXX
|
|
#define MPD_DB_SIMPLE_EXPORTED_SONG_HXX
|
|
|
|
#include "song/LightSong.hxx"
|
|
#include "tag/Tag.hxx"
|
|
|
|
/**
|
|
* The return type for Song::Export(). In addition to implementing
|
|
* #LightSong, it hold allocations necessary to represent the #Song as
|
|
* a #LightSong, e.g. a merged #Tag.
|
|
*/
|
|
class ExportedSong : public LightSong {
|
|
Tag tag_buffer;
|
|
|
|
public:
|
|
using LightSong::LightSong;
|
|
|
|
ExportedSong(const char *_uri, Tag &&_tag) noexcept
|
|
:LightSong(_uri, tag_buffer),
|
|
tag_buffer(std::move(_tag)) {}
|
|
|
|
/* this custom move constructor is necessary so LightSong::tag
|
|
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),
|
|
tag_buffer(std::move(src.tag_buffer)) {}
|
|
|
|
ExportedSong &operator=(ExportedSong &&) = delete;
|
|
};
|
|
|
|
#endif
|