From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 29 Jul 2016 12:11:52 +0000 (+0200)
Subject: 'Sandboxed' property isn't properly propagated to child frames
X-Git-Tag: v2.5.0~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=546bdbcf6acaffc3ab8d94274f291393d621b596;p=icinga2

'Sandboxed' property isn't properly propagated to child frames

refs #12247
---

diff --git a/lib/base/scriptframe.cpp b/lib/base/scriptframe.cpp
index c9aec385c..3526c08d4 100644
--- a/lib/base/scriptframe.cpp
+++ b/lib/base/scriptframe.cpp
@@ -28,6 +28,11 @@ boost::thread_specific_ptr<std::stack<ScriptFrame *> > ScriptFrame::m_ScriptFram
 ScriptFrame::ScriptFrame(void)
 	: Locals(new Dictionary()), Self(ScriptGlobal::GetGlobals()), Sandboxed(false), Depth(0)
 {
+	std::stack<ScriptFrame *> *frames = m_ScriptFrames.get();
+
+	if (frames && !frames->empty())
+		Sandboxed = frames->top()->Sandboxed;
+
 	PushFrame(this);
 }