tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in ConfigItem::RemoveIgnoredItems

Browse Source 
fixes #4952
This commit is contained in:
Gunnar Beutner 2017-02-01 12:56:53 +01:00
parent 6652727d46
commit 245cb0e930
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/config/configitem.cpp
View File

@ -657,8 +657,7 @@ std::vector<ConfigItem::Ptr> ConfigItem::GetItems(const String& type)
items.reserve(it->second.size()); items.reserve(it->second.size());
for (const ItemMap::value_type& kv : it->second) for (const ItemMap::value_type& kv : it->second) {
{
items.push_back(kv.second); items.push_back(kv.second);
} }
@ -678,8 +677,7 @@ std::vector<ConfigItem::Ptr> ConfigItem::GetDefaultTemplates(const String& type)
items.reserve(it->second.size()); items.reserve(it->second.size());
for (const ItemMap::value_type& kv : it->second) for (const ItemMap::value_type& kv : it->second) {
{
items.push_back(kv.second); items.push_back(kv.second);
} }
@ -697,12 +695,7 @@ void ConfigItem::RemoveIgnoredItems(const String& allowedConfigPath)
Log(LogNotice, "ConfigItem") Log(LogNotice, "ConfigItem")
<< "Removing ignored item path '" << path << "'."; << "Removing ignored item path '" << path << "'.";
if (unlink(path.CStr()) < 0) { (void) unlink(path.CStr());
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("unlink")
<< boost::errinfo_errno(errno)
<< boost::errinfo_file_name(path));
}
} }
m_IgnoredItems.clear(); m_IgnoredItems.clear();