Skip to content

M
mpd
Commit abb28593 authored by gd's avatar gd Committed by Max Kellermann
Browse files
Options

TagBuilder::RemoveType: added missing tag pool lock before call to tag_pool_put_item

parent 115693b0
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
NEWS
View file @ abb28593
ver 0.23.12 (not yet released) ver 0.23.12 (not yet released)
* tags
- fix crash bug due to race condition
ver 0.23.11 (2022/11/28) ver 0.23.11 (2022/11/28)
* database * database
......
src/tag/Builder.cxx
View file @ abb28593
...@@ -263,8 +263,14 @@ TagBuilder::RemoveAll() noexcept ...@@ -263,8 +263,14 @@ TagBuilder::RemoveAll() noexcept
void void
TagBuilder::RemoveType(TagType type) noexcept TagBuilder::RemoveType(TagType type) noexcept
{ {
if (items.empty())
/* don't acquire the tag_pool_lock if we're not going
to call tag_pool_put_item() anyway */
return;
const auto begin = items.begin(), end = items.end(); const auto begin = items.begin(), end = items.end();
const std::scoped_lock<Mutex> protect(tag_pool_lock);
items.erase(std::remove_if(begin, end, items.erase(std::remove_if(begin, end,
[type](TagItem *item) { [type](TagItem *item) {
if (item->type != type) if (item->type != type)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment