From: Gunnar Beutner <gunnar@beutner.name>
Date: Sat, 10 May 2014 10:03:54 +0000 (+0200)
Subject: Use a separate scope for "for" loops.
X-Git-Tag: v0.0.11~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d7e028f92540b466bab16bdbbbaa5966bc5f5b4;p=icinga2

Use a separate scope for "for" loops.

Refs #6183
---

diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index 6295aab2a..be027f956 100644
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -586,11 +586,12 @@ Value AExpression::OpFor(const AExpression* expr, const Dictionary::Ptr& locals)
 
 	ObjectLock olock(arr);
 	BOOST_FOREACH(const Value& value, arr) {
-		locals->Set(varname, value);
-		ascope->Evaluate(locals);
-	}
+		Dictionary::Ptr xlocals = make_shared<Dictionary>();
+		xlocals->Set("__parent", locals);
+		xlocals->Set(varname, value);
 
-	locals->Remove(varname);
+		ascope->Evaluate(xlocals);
+	}
 
 	return Empty;
 }