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

Merge pull request #9517 from Icinga/bugfix/do-not-always-decrease-frame-depth 

Expression: Decrease `frame.Depth` only when calling `IncreaseStackDe…
This commit is contained in:
Julian Brost 2022-09-07 13:55:50 +02:00 committed by GitHub
parent 86b63a57ae 31785b48fd
commit 14e4f6b921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/config/expression.cpp
View File

@ -13,6 +13,7 @@
#include "base/loader.hpp" #include "base/loader.hpp"
#include "base/reference.hpp" #include "base/reference.hpp"
#include "base/namespace.hpp" #include "base/namespace.hpp"
#include "base/defer.hpp"
#include <boost/exception_ptr.hpp> #include <boost/exception_ptr.hpp>
#include <boost/exception/errinfo_nested_exception.hpp> #include <boost/exception/errinfo_nested_exception.hpp>
@ -46,22 +47,20 @@ ExpressionResult Expression::Evaluate(ScriptFrame& frame, DebugHint *dhint) cons
#endif /* I2_DEBUG */ #endif /* I2_DEBUG */
frame.IncreaseStackDepth(); frame.IncreaseStackDepth();
Defer decreaseStackDepth([&frame]{
frame.DecreaseStackDepth();
});
ExpressionResult result = DoEvaluate(frame, dhint); ExpressionResult result = DoEvaluate(frame, dhint);
frame.DecreaseStackDepth();
return result; return result;
} catch (ScriptError& ex) { } catch (ScriptError& ex) {
frame.DecreaseStackDepth();
ScriptBreakpoint(frame, &ex, GetDebugInfo()); ScriptBreakpoint(frame, &ex, GetDebugInfo());
throw; throw;
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
frame.DecreaseStackDepth();
BOOST_THROW_EXCEPTION(ScriptError("Error while evaluating expression: " + String(ex.what()), GetDebugInfo()) BOOST_THROW_EXCEPTION(ScriptError("Error while evaluating expression: " + String(ex.what()), GetDebugInfo())
<< boost::errinfo_nested_exception(boost::current_exception())); << boost::errinfo_nested_exception(boost::current_exception()));
} }
frame.DecreaseStackDepth();
} }
bool Expression::GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const bool Expression::GetReference(ScriptFrame& frame, bool init_dict, Value *parent, String *index, DebugHint **dhint) const