]> granicus.if.org Git - icinga2/commitdiff
MacroProcessor::ResolveArguments(): skip null argument values bugfix/apt-dist-upgrade-7558 7567/head
authorAlexander A. Klimov <grandmaster@al2klimov.de>
Tue, 8 Oct 2019 15:06:06 +0000 (17:06 +0200)
committerAlexander A. Klimov <grandmaster@al2klimov.de>
Tue, 8 Oct 2019 15:06:06 +0000 (17:06 +0200)
refs #7558

lib/icinga/macroprocessor.cpp

index df1e41d17701215b5a598c2865ea2d9393fc4816..c92ab19d4ec9541f9e51a6d7b26fce80a1cb2a8a 100644 (file)
@@ -511,6 +511,8 @@ Value MacroProcessor::ResolveArguments(const Value& command, const Dictionary::P
                                continue;
                        }
 
+                       arg.SkipValue = arg.SkipValue || arg.AValue.GetType() == ValueEmpty;
+
                        args.emplace_back(std::move(arg));
                }