[icinga-checkins] icinga.org: icinga2/master: Bugfix: Ignore missing macro dicts.

git at icinga.org git at icinga.org
Sun Feb 10 01:56:44 CET 2013


Module: icinga2
Branch: master
Commit: 7484b4682ae86c5e3690c66c387b00d669ce95ba
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=7484b4682ae86c5e3690c66c387b00d669ce95ba

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sun Feb 10 01:56:26 2013 +0100

Bugfix: Ignore missing macro dicts.

---

 lib/icinga/macroprocessor.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp
index e1490aa..391ff24 100644
--- a/lib/icinga/macroprocessor.cpp
+++ b/lib/icinga/macroprocessor.cpp
@@ -62,6 +62,9 @@ Dictionary::Ptr MacroProcessor::MakeEnvironment(const vector<Dictionary::Ptr>& d
 	Dictionary::Ptr result = boost::make_shared<Dictionary>();
 
 	BOOST_REVERSE_FOREACH(const Dictionary::Ptr& dict, dicts) {
+		if (!dict)
+			continue;
+
 		String key;
 		Value value;
 		BOOST_FOREACH(tie(key, value), dict) {





More information about the icinga-checkins mailing list