mirror of
https://github.com/PaddiM8/kalker.git
synced 2025-06-27 21:21:42 +02:00
Merge pull request #122 from kvnxiao/prevent-stack-overflow
Add max recursion depth check to avoid stack overflow during statement evaluation
This commit is contained in:
commit
28b6e42542
@ -19,6 +19,7 @@ pub enum KalkError {
|
|||||||
InvalidNumberLiteral(String),
|
InvalidNumberLiteral(String),
|
||||||
InvalidOperator,
|
InvalidOperator,
|
||||||
InvalidUnit,
|
InvalidUnit,
|
||||||
|
StackOverflow,
|
||||||
TimedOut,
|
TimedOut,
|
||||||
VariableReferencesItself,
|
VariableReferencesItself,
|
||||||
PiecewiseConditionsAreFalse,
|
PiecewiseConditionsAreFalse,
|
||||||
@ -61,6 +62,7 @@ impl ToString for KalkError {
|
|||||||
KalkError::InvalidNumberLiteral(x) => format!("Invalid number literal: '{}'.", x),
|
KalkError::InvalidNumberLiteral(x) => format!("Invalid number literal: '{}'.", x),
|
||||||
KalkError::InvalidOperator => String::from("Invalid operator."),
|
KalkError::InvalidOperator => String::from("Invalid operator."),
|
||||||
KalkError::InvalidUnit => String::from("Invalid unit."),
|
KalkError::InvalidUnit => String::from("Invalid unit."),
|
||||||
|
KalkError::StackOverflow => String::from("Operation recursed too deeply."),
|
||||||
KalkError::TimedOut => String::from("Operation took too long."),
|
KalkError::TimedOut => String::from("Operation took too long."),
|
||||||
KalkError::VariableReferencesItself => String::from("Variable references itself."),
|
KalkError::VariableReferencesItself => String::from("Variable references itself."),
|
||||||
KalkError::PiecewiseConditionsAreFalse => String::from("All the conditions in the piecewise are false."),
|
KalkError::PiecewiseConditionsAreFalse => String::from("All the conditions in the piecewise are false."),
|
||||||
|
@ -9,6 +9,8 @@ use crate::symbol_table::SymbolTable;
|
|||||||
use crate::{as_number_or_zero, numerical};
|
use crate::{as_number_or_zero, numerical};
|
||||||
use crate::{float, prelude};
|
use crate::{float, prelude};
|
||||||
|
|
||||||
|
const DEFAULT_MAX_RECURSION_DEPTH: u32 = 128;
|
||||||
|
|
||||||
pub struct Context<'a> {
|
pub struct Context<'a> {
|
||||||
pub symbol_table: &'a mut SymbolTable,
|
pub symbol_table: &'a mut SymbolTable,
|
||||||
angle_unit: String,
|
angle_unit: String,
|
||||||
@ -20,6 +22,8 @@ pub struct Context<'a> {
|
|||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
start_time: std::time::SystemTime,
|
start_time: std::time::SystemTime,
|
||||||
is_approximation: bool,
|
is_approximation: bool,
|
||||||
|
recursion_depth: u32,
|
||||||
|
max_recursion_depth: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Context<'a> {
|
impl<'a> Context<'a> {
|
||||||
@ -40,6 +44,8 @@ impl<'a> Context<'a> {
|
|||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
start_time: std::time::SystemTime::now(),
|
start_time: std::time::SystemTime::now(),
|
||||||
is_approximation: false,
|
is_approximation: false,
|
||||||
|
recursion_depth: 0,
|
||||||
|
max_recursion_depth: DEFAULT_MAX_RECURSION_DEPTH,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -129,7 +135,10 @@ pub(crate) fn eval_expr(
|
|||||||
Expr::Boolean(value) => Ok(KalkValue::Boolean(*value)),
|
Expr::Boolean(value) => Ok(KalkValue::Boolean(*value)),
|
||||||
Expr::Group(expr) => eval_group_expr(context, expr, unit),
|
Expr::Group(expr) => eval_group_expr(context, expr, unit),
|
||||||
Expr::FnCall(identifier, expressions) => {
|
Expr::FnCall(identifier, expressions) => {
|
||||||
eval_fn_call_expr(context, identifier, expressions, unit)
|
context.recursion_depth += 1;
|
||||||
|
let res = eval_fn_call_expr(context, identifier, expressions, unit);
|
||||||
|
context.recursion_depth -= 1;
|
||||||
|
res
|
||||||
}
|
}
|
||||||
Expr::Piecewise(pieces) => eval_piecewise(context, pieces, unit),
|
Expr::Piecewise(pieces) => eval_piecewise(context, pieces, unit),
|
||||||
Expr::Vector(values) => eval_vector(context, values),
|
Expr::Vector(values) => eval_vector(context, values),
|
||||||
@ -333,6 +342,10 @@ pub(crate) fn eval_fn_call_expr(
|
|||||||
expressions: &[Expr],
|
expressions: &[Expr],
|
||||||
unit: Option<&String>,
|
unit: Option<&String>,
|
||||||
) -> Result<KalkValue, KalkError> {
|
) -> Result<KalkValue, KalkError> {
|
||||||
|
if context.recursion_depth > context.max_recursion_depth {
|
||||||
|
return Err(KalkError::StackOverflow);
|
||||||
|
}
|
||||||
|
|
||||||
if identifier.prime_count > 0 {
|
if identifier.prime_count > 0 {
|
||||||
context.is_approximation = true;
|
context.is_approximation = true;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user