mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 16:54:58 +02:00
Enforce call stack depth limit for all calls (#11729)
# Description Previously, only direcly-recursive calls were checked for recursion depth. But most recursive calls in nushell are mutually recursive since expressions like `for`, `where`, `try` and `do` all execute a separte block. ```nushell def f [] { do { f } } ``` Calling `f` would crash nushell with a stack overflow. I think the only general way to prevent such a stack overflow is to enforce a maximum call stack depth instead of only disallowing directly recursive calls. This commit also moves that logic into `eval_call()` instead of `eval_block()` because the recursion limit is tracked in the `Stack`, but not all blocks are evaluated in a new stack. Incrementing the recursion depth of the caller's stack would permanently increment that for all future calls. Fixes #11667 # User-Facing Changes Any function call can now fail with `recursion_limit_reached` instead of just directly recursive calls. Mutually-recursive calls no longer crash nushell. # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
@ -598,8 +598,6 @@ pub fn parse_def(
|
||||
*declaration = signature.clone().into_block_command(block_id);
|
||||
|
||||
let block = working_set.get_block_mut(block_id);
|
||||
let calls_itself = block_calls_itself(block, decl_id);
|
||||
block.recursive = Some(calls_itself);
|
||||
block.signature = signature;
|
||||
block.redirect_env = has_env;
|
||||
|
||||
@ -758,10 +756,7 @@ pub fn parse_extern(
|
||||
} else {
|
||||
*declaration = signature.clone().into_block_command(block_id);
|
||||
|
||||
let block = working_set.get_block_mut(block_id);
|
||||
let calls_itself = block_calls_itself(block, decl_id);
|
||||
block.recursive = Some(calls_itself);
|
||||
block.signature = signature;
|
||||
working_set.get_block_mut(block_id).signature = signature;
|
||||
}
|
||||
} else {
|
||||
let decl = KnownExternal {
|
||||
@ -799,43 +794,6 @@ pub fn parse_extern(
|
||||
}])
|
||||
}
|
||||
|
||||
fn block_calls_itself(block: &Block, decl_id: usize) -> bool {
|
||||
block.pipelines.iter().any(|pipeline| {
|
||||
pipeline
|
||||
.elements
|
||||
.iter()
|
||||
.any(|pipe_element| match pipe_element {
|
||||
PipelineElement::Expression(
|
||||
_,
|
||||
Expression {
|
||||
expr: Expr::Call(call_expr),
|
||||
..
|
||||
},
|
||||
) => {
|
||||
if call_expr.decl_id == decl_id {
|
||||
return true;
|
||||
}
|
||||
call_expr.arguments.iter().any(|arg| match arg {
|
||||
Argument::Positional(Expression { expr, .. }) => match expr {
|
||||
Expr::Keyword(.., expr) => {
|
||||
let expr = expr.as_ref();
|
||||
let Expression { expr, .. } = expr;
|
||||
match expr {
|
||||
Expr::Call(call_expr2) => call_expr2.decl_id == decl_id,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
Expr::Call(call_expr2) => call_expr2.decl_id == decl_id,
|
||||
_ => false,
|
||||
},
|
||||
_ => false,
|
||||
})
|
||||
}
|
||||
_ => false,
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
pub fn parse_alias(
|
||||
working_set: &mut StateWorkingSet,
|
||||
lite_command: &LiteCommand,
|
||||
|
Reference in New Issue
Block a user