Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 21:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[complete] Fix crash with __fish_describe_command

Browse source 
Our completion machinery calls our `__fish_describe_command` function
to describe commands via apropos. Only it trusts the output a bit too
much, so it crashes when any line from that is shorter than the
original string.

Fix this by skipping any string that is shorter than the original,
since it can't be a match anyway.

Also stop doing wcslen so often - std::strings are nice!

Fixes #5014.
This commit is contained in:
Fabian Homborg 2018-06-01 20:14:29 +02:00
parent 44d68f99ea
commit 72e9d41dcc
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/complete.cpp
View file

@ -542,20 +542,19 @@ void completer_t::complete_strings(const wcstring &wc_escaped, const wchar_t *de
void completer_t::complete_cmd_desc(const wcstring &str) { void completer_t::complete_cmd_desc(const wcstring &str) {
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
const wchar_t *cmd_start; wcstring cmd;
const wchar_t *const cmd = str.c_str(); size_t pos = str.find_last_of(L'/');
cmd_start = wcsrchr(cmd, L'/'); if (pos != std::string::npos) {
cmd = wcstring(str, pos);
if (cmd_start) } else {
cmd_start++; cmd = str;
else }
cmd_start = cmd;
// Using apropos with a single-character search term produces far to many results - require at // Using apropos with a single-character search term produces far to many results - require at
// least two characters if we don't know the location of the whatis-database. // least two characters if we don't know the location of the whatis-database.
if (wcslen(cmd_start) < 2) return; if (cmd.length() < 2) return;
if (wildcard_has(cmd_start, 0)) { if (wildcard_has(cmd, 0)) {
return; return;
} }
@ -572,7 +571,7 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
} }
wcstring lookup_cmd(L"__fish_describe_command "); wcstring lookup_cmd(L"__fish_describe_command ");
lookup_cmd.append(escape_string(cmd_start, 1)); lookup_cmd.append(escape_string(cmd, 1));
// First locate a list of possible descriptions using a single call to apropos or a direct // First locate a list of possible descriptions using a single call to apropos or a direct
// search if we know the location of the whatis database. This can take some time on slower // search if we know the location of the whatis database. This can take some time on slower
@ -589,7 +588,8 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
// mqudsi: I don't know if the above were ever true, but it's certainly not any more. // mqudsi: I don't know if the above were ever true, but it's certainly not any more.
// Plenty of allocations below. // Plenty of allocations below.
for (const wcstring &elstr : list) { for (const wcstring &elstr : list) {
const wcstring fullkey(elstr, wcslen(cmd_start)); if (elstr.length() < cmd.length()) continue;
const wcstring fullkey(elstr, cmd.length());
size_t tab_idx = fullkey.find(L'\t'); size_t tab_idx = fullkey.find(L'\t');
if (tab_idx == wcstring::npos) continue; if (tab_idx == wcstring::npos) continue;