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

complete: Don't allow wrapping a command with itself

Browse Source 
Double-fixes #5541, by not allowing it to happen.
This commit is contained in:
Fabian Homborg
2019-01-17 09:49:50 +01:00
parent 84339d5636
commit 58b696bed1
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/complete.cpp
View File

@@ -1656,6 +1656,11 @@ bool complete_add_wrapper(const wcstring &command, const wcstring &new_target) {
return false; return false;
} }
// If the command and the target are the same,
// there's no point in following the wrap-chain because we'd only complete the same thing.
// TODO: This should maybe include full cycle detection.
if (command == new_target) return false;
auto locked_map = wrapper_map.acquire(); auto locked_map = wrapper_map.acquire();
wrapper_map_t &wraps = *locked_map; wrapper_map_t &wraps = *locked_map;
wcstring_list_t *targets = &wraps[command]; wcstring_list_t *targets = &wraps[command];