h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-03 06:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove the forbidden function stack

Browse Source 
Detect forbidden functions directly from the associated block_t.
Also unify where we do stack overflow detection.
This commit is contained in:
ridiculousfish
2019-11-10 12:36:46 -08:00
parent 626237c9c3
commit 2555ecf757
5 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/parser.h
View File

@@ -193,8 +193,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
volatile sig_atomic_t cancellation_requested = false;
/// The current execution context.
std::unique_ptr<parse_execution_context_t> execution_context;
/// List of called functions, used to help prevent infinite recursion.
wcstring_list_t forbidden_function;
/// The jobs associated with this parser.
job_list_t job_list;
/// The list of blocks. This is a deque because we give out raw pointers to callers, who hold
@@ -342,13 +340,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
void get_backtrace(const wcstring &src, const parse_error_list_t &errors,
wcstring &output) const;
/// Tell the parser that the specified function may not be run if not inside of a conditional
/// block. This is to remove some possibilities of infinite recursion.
void forbid_function(const wcstring &function);
/// Undo last call to parser_forbid_function().
void allow_function();
/// Output profiling data to the given filename.
void emit_profiling(const char *path) const;
@@ -364,6 +355,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
/// Return a string representing the current stack trace.
wcstring stack_trace() const;
/// \return whether the number of functions in the stack exceeds our stack depth limit.
bool function_stack_is_overflowing() const;
/// \return a shared pointer reference to this parser.
std::shared_ptr<parser_t> shared();