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

Fix crash in ConfigCompiler::RegisterZoneDir 

fixes #9987
This commit is contained in:
Gunnar Beutner 2015-08-24 14:14:44 +02:00
parent f12b820685
commit 6af771b3bf
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/config/configcompiler.cpp
View File

@ -30,6 +30,7 @@
using namespace icinga;
std::vector<String> ConfigCompiler::m_IncludeSearchDirs;
boost::mutex ConfigCompiler::m_ZoneDirsMutex;
std::map<String, std::vector<ZoneFragment> > ConfigCompiler::m_ZoneDirs;
/**
@ -305,8 +306,8 @@ void ConfigCompiler::AddIncludeSearchDir(const String& dir)
std::vector<ZoneFragment> ConfigCompiler::GetZoneDirs(const String& zone)
{
std::map<String, std::vector<ZoneFragment> >::const_iterator it;
it = m_ZoneDirs.find(zone);
boost::mutex::scoped_lock lock(m_ZoneDirsMutex);
std::map<String, std::vector<ZoneFragment> >::const_iterator it = m_ZoneDirs.find(zone);
if (it == m_ZoneDirs.end())
return std::vector<ZoneFragment>();
else
@ -318,6 +319,8 @@ void ConfigCompiler::RegisterZoneDir(const String& tag, const String& ppath, con
ZoneFragment zf;
zf.Tag = tag;
zf.Path = ppath;
boost::mutex::scoped_lock lock(m_ZoneDirsMutex);
m_ZoneDirs[zoneName].push_back(zf);
}

1
lib/config/configcompiler.hpp
View File

@ -130,6 +130,7 @@ private:
void *m_Scanner;
static std::vector<String> m_IncludeSearchDirs;
static boost::mutex m_ZoneDirsMutex;
static std::map<String, std::vector<ZoneFragment> > m_ZoneDirs;
void InitializeScanner(void);