diff options
| author | Cebtenzzre <cebtenzzre@gmail.com> | 2021-06-23 17:39:30 -0400 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-08-05 14:25:55 +0200 |
| commit | 551c941b5a5cd9beea2e2970103839d5535e2d11 (patch) | |
| tree | 40adba123e1a927cdc80bae93289a3f7b3176004 | |
| parent | 624c77ab43e7c4c845b2a01c0a716d3f4a4d409e (diff) | |
tag/Builder: don't ignore the result of tag_pool_dup_item
Also, use RemoveAll() instead of directly clearing TagBuilder::items in
most cases, as its elements represent references that must be released.
Closes #1023
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/tag/Builder.cxx | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -6,6 +6,8 @@ ver 0.22.10 (not yet released) * input - curl: fix crash bug after stream with Icy metadata was closed by peer - tidal: remove defunct unmaintained plugin +* tags + - fix crash caused by bug in TagBuilder and a few potential reference leaks ver 0.22.9 (2021/06/23) * database diff --git a/src/tag/Builder.cxx b/src/tag/Builder.cxx index 8f38ae172..76b404499 100644 --- a/src/tag/Builder.cxx +++ b/src/tag/Builder.cxx @@ -69,8 +69,8 @@ TagBuilder::operator=(const TagBuilder &other) noexcept /* increment the tag pool refcounters */ const std::lock_guard<Mutex> protect(tag_pool_lock); - for (auto i : items) - tag_pool_dup_item(i); + for (auto &i : items) + i = tag_pool_dup_item(i); return *this; } @@ -80,6 +80,8 @@ TagBuilder::operator=(TagBuilder &&other) noexcept { duration = other.duration; has_playlist = other.has_playlist; + + RemoveAll(); items = std::move(other.items); return *this; |