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

Fix crash when using include_recursive in an object definition 

fixes #12022
This commit is contained in:
Gunnar Beutner 2016-06-22 17:01:36 +02:00
parent 2de249ed65
commit 906ab613f3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/config/configcompiler.cpp
View File

@ -180,7 +180,10 @@ Expression *ConfigCompiler::HandleIncludeRecursive(const String& relativeBase, c
std::vector<Expression *> expressions; std::vector<Expression *> expressions;
Utility::GlobRecursive(ppath, pattern, boost::bind(&ConfigCompiler::CollectIncludes, boost::ref(expressions), _1, zone, package), GlobFile); Utility::GlobRecursive(ppath, pattern, boost::bind(&ConfigCompiler::CollectIncludes, boost::ref(expressions), _1, zone, package), GlobFile);
return new DictExpression(expressions);
DictExpression *dict = new DictExpression(expressions);
dict->MakeInline();
return dict;
} }
void ConfigCompiler::HandleIncludeZone(const String& relativeBase, const String& tag, const String& path, const String& pattern, const String& package, std::vector<Expression *>& expressions) void ConfigCompiler::HandleIncludeZone(const String& relativeBase, const String& tag, const String& path, const String& pattern, const String& package, std::vector<Expression *>& expressions)