github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 18:53:44 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove triggerable assert in unescape_string_internal

Browse Source 
Fixes #4954 - in a hacky way.
This commit is contained in:
Fabian Homborg 2018-05-02 16:33:28 +02:00
parent e02e485cc6
commit baeeef3233
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common.cpp
View File

@ -1363,7 +1363,11 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
}
case L'}': {
if (unescape_special) {
assert(brace_count > 0 && "imbalanced brackets are a tokenizer error, we shouldn't be able to get here");
// HACK: The completion machinery sometimes hands us partial tokens.
// We can't parse them properly, but it shouldn't hurt,
// so we don't assert here.
// See #4954.
// assert(brace_count > 0 && "imbalanced brackets are a tokenizer error, we shouldn't be able to get here");
brace_count--;
brace_text_start = brace_text_start && brace_count > 0;
to_append_or_none = BRACE_END;

3
src/complete.cpp
View File

@ -1078,6 +1078,9 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
bool complete_from_start = !complete_from_separator || !string_prefixes_string(L"-", str);
if (complete_from_separator) {
// FIXME: This just cuts the token,
// so any quoting or braces gets lost.
// See #4954.
const wcstring sep_string = wcstring(str, sep_index + 1);
std::vector<completion_t> local_completions;
if (expand_string(sep_string, &local_completions, flags, NULL) == EXPAND_ERROR) {