Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move recursion_count check to the top of eval_ir_block

Browse Source
This commit is contained in:
Devyn Cairns 2024-07-05 23:56:10 -07:00
parent be8637d6cc
commit c249922e03
No known key found for this signature in database
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/nu-engine/src/eval_ir.rs
View File

@ -19,6 +19,18 @@ pub fn eval_ir_block<D: DebugContext>(
block: &Block, block: &Block,
input: PipelineData, input: PipelineData,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
// Rust does not check recursion limits outside of const evaluation.
// But nu programs run in the same process as the shell.
// To prevent a stack overflow in user code from crashing the shell,
// we limit the recursion depth of function calls.
let maximum_call_stack_depth: u64 = engine_state.config.recursion_limit as u64;
if stack.recursion_count > maximum_call_stack_depth {
return Err(ShellError::RecursionLimitReached {
recursion_limit: maximum_call_stack_depth,
span: block.span,
});
}
if let Some(ir_block) = &block.ir_block { if let Some(ir_block) = &block.ir_block {
D::enter_block(engine_state, block); D::enter_block(engine_state, block);
@ -843,18 +855,6 @@ fn eval_call<D: DebugContext>(
// what to put where. // what to put where.
let block = engine_state.get_block(block_id); let block = engine_state.get_block(block_id);
// Rust does not check recursion limits outside of const evaluation.
// But nu programs run in the same process as the shell.
// To prevent a stack overflow in user code from crashing the shell,
// we limit the recursion depth of function calls.
let maximum_call_stack_depth: u64 = engine_state.config.recursion_limit as u64;
if stack.recursion_count > maximum_call_stack_depth {
return Err(ShellError::RecursionLimitReached {
recursion_limit: maximum_call_stack_depth,
span: *ctx.block_span,
});
}
result = eval_block_with_early_return::<D>(engine_state, &mut stack, block, input); result = eval_block_with_early_return::<D>(engine_state, &mut stack, block, input);
drop(stack); drop(stack);