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

Fix shell escaping in the macro processor.

This commit is contained in:
Gunnar Beutner 2013-08-30 16:52:13 +02:00
parent 1a3ecb04fb
commit 8df0525e3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/icinga/macroprocessor.cpp
View File

@ -94,12 +94,12 @@ String MacroProcessor::InternalResolveMacros(const String& str, const std::vecto
if (!found) if (!found)
Log(LogWarning, "icinga", "Macro '" + name + "' is not defined."); Log(LogWarning, "icinga", "Macro '" + name + "' is not defined.");
if (escapeFn)
resolved_macro = escapeFn(resolvedMacro);
result.Replace(pos_first, pos_second - pos_first + 1, resolved_macro); result.Replace(pos_first, pos_second - pos_first + 1, resolved_macro);
offset = pos_first + resolved_macro.GetLength(); offset = pos_first + resolved_macro.GetLength();
} }
if (escapeFn)
result = escapeFn(result);
return result; return result;
} }