upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-06-10 17:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 85f8839af1 into f63bbec4ab

Browse source
This commit is contained in:
Alexander Aleksandrovič Klimov 2026-05-21 15:54:51 +00:00 committed by GitHub
commit fd212c3a7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/config/expression.cpp
View file

@ -39,6 +39,8 @@ void Expression::ScriptBreakpoint(ScriptFrame& frame, ScriptError *ex, const Deb
ExpressionResult Expression::Evaluate(ScriptFrame& frame, DebugHint *dhint) const
{
ExpressionResult result (Empty);
try {
#ifdef I2_DEBUG
/* std::ostringstream msgbuf;
@ -49,11 +51,15 @@ ExpressionResult Expression::Evaluate(ScriptFrame& frame, DebugHint *dhint) cons
frame.IncreaseStackDepth();
Defer decreaseStackDepth([&frame]{
try {
result = DoEvaluate(frame, dhint);
} catch (...) {
frame.DecreaseStackDepth();
});
throw;
}
frame.DecreaseStackDepth();
ExpressionResult result = DoEvaluate(frame, dhint);
return result;
} catch (ScriptError& ex) {
ScriptBreakpoint(frame, &ex, GetDebugInfo());