tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing array locking in IcingaDB::GetArrayDeletedValues() 

icinga::Array requires locking by the caller when iterating using Begin() and
End(). This is only checked in debug builds but there it makes this function
fail.
This commit is contained in:
Julian Brost 2022-03-09 14:29:44 +01:00
parent bf5b905707
commit 9630e86997
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/icingadb/icingadb-utility.cpp
View File

@ -266,14 +266,23 @@ std::vector<Value> IcingaDB::GetArrayDeletedValues(const Array::Ptr& arrayOld, c
}
if (!arrayNew) {
ObjectLock olock (arrayOld);
return std::vector<Value>(arrayOld->Begin(), arrayOld->End());
}
std::vector<Value> vectorOld(arrayOld->Begin(), arrayOld->End());
std::vector<Value> vectorOld;
{
ObjectLock olock (arrayOld);
vectorOld.assign(arrayOld->Begin(), arrayOld->End());
}
std::sort(vectorOld.begin(), vectorOld.end());
vectorOld.erase(std::unique(vectorOld.begin(), vectorOld.end()), vectorOld.end());
std::vector<Value> vectorNew(arrayNew->Begin(), arrayNew->End());
std::vector<Value> vectorNew;
{
ObjectLock olock (arrayNew);
vectorNew.assign(arrayNew->Begin(), arrayNew->End());
}
std::sort(vectorNew.begin(), vectorNew.end());
vectorNew.erase(std::unique(vectorNew.begin(), vectorNew.end()), vectorNew.end());