github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-04-01 17:35:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Print an error when complete reaches its recursion limit

Browse Source
This commit is contained in:
Johannes Altmanninger 2019-10-03 07:55:52 +02:00 committed by Fabian Homborg
parent b9a22c7136
commit aa011f70a8
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/builtin_complete.cpp
View File

@ -336,7 +336,10 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
parser.libdata().transient_commandlines.push_back(do_complete_param);
cleanup_t remove_transient([&] { parser.libdata().transient_commandlines.pop_back(); });
if (parser.libdata().builtin_complete_recursion_level < 1) {
// Allow a limited number of recursive calls to complete (#3474).
if (parser.libdata().builtin_complete_recursion_level >= 1) {
streams.err.append_format(L"%ls: maximum recursive depth reached\n", cmd);
} else {
parser.libdata().builtin_complete_recursion_level++;
std::vector<completion_t> comp;

6
tests/checks/complete.fish
View File

@ -59,3 +59,9 @@ complete
# CHECK: complete {{.*}}
# CHECK: complete {{.*}}
# CHECK: complete {{.*}}
# Recursive calls to complete (see #3474)
complete -c complete_test_recurse1 -xa '(echo recursing 1>&2; complete -C"complete_test_recurse1 ")'
complete -C'complete_test_recurse1 '
# CHECKERR: recursing
# CHECKERR: complete: maximum recursive depth reached

2
tests/checks/wraps.fish
View File

@ -26,4 +26,6 @@ complete -c testcommand2 -x -a "(testcommand2_complete)"
complete -c testcommand2 --wraps "testcommand2 from_wraps "
complete -C'testcommand2 explicit '
# CHECKERR: explicit
# CHECKERR: complete: maximum recursive depth reached
# CHECKERR: from_wraps explicit
# CHECKERR: complete: maximum recursive depth reached