From 906ab613f3cd81f23833ba98729d7d1c0832230f Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 22 Jun 2016 17:01:36 +0200 Subject: [PATCH] Fix crash when using include_recursive in an object definition fixes #12022 --- lib/config/configcompiler.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp index 6eb826ff4..7e76e9883 100644 --- a/lib/config/configcompiler.cpp +++ b/lib/config/configcompiler.cpp @@ -180,7 +180,10 @@ Expression *ConfigCompiler::HandleIncludeRecursive(const String& relativeBase, c std::vector expressions; 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& expressions)