UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Protect from deep recursion in Expressio::approximateToEval

Browse Source
This commit is contained in:
Léa Saviot
2018-11-08 15:50:22 +01:00
committed by Émilie Feral
parent 1dc18d9a50
commit 5bba2e9528
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
poincare/src/expression.cpp
View File

@@ -243,12 +243,20 @@ void Expression::defaultSetChildrenInPlace(Expression other) {
template<typename U>
Evaluation<U> Expression::approximateToEvaluation(Context& context, Preferences::AngleUnit angleUnit) const {
assert(sRecursionCountReinitializationIsLocked == true);
bool willHaveToUnlock = ResetRecursionCountAndLockReset();
IncrementRecursionCount();
Evaluation<U> result;
if (RecursionMaximalDepthExceeded()) {
return Complex<U>::Undefined(); // TODO Propagate error "Recursion too deep"
result = Complex<U>::Undefined(); // TODO Propagate error "Recursion too deep"
} else {
result = node()->approximate(U(), context, angleUnit);
}
return node()->approximate(U(), context, angleUnit);
if (willHaveToUnlock) {
UnlockRecursionCountReset();
}
return result;
}
Expression Expression::defaultReplaceSymbolWithExpression(const SymbolAbstract & symbol, const Expression expression) {