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

[string] Allow url/var escaping to handle NULs

Browse Source 
Fixes #4605.
This commit is contained in:
Fabian Homborg
2018-01-03 12:29:01 +01:00
parent 485fdbde41
commit 4dc1c6ca39
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/builtin_string.cpp
View File

@@ -517,8 +517,8 @@ static int string_escape_url(options_t &opts, int optind, wchar_t **argv, io_str
escape_flags_t flags = 0;
arg_iterator_t aiter(argv, optind, streams);
while (const wchar_t *arg = aiter.next()) {
streams.out.append(escape_string(arg, flags, STRING_STYLE_URL));
while (auto arg = aiter.nextstr()) {
streams.out.append(escape_string(*arg, flags, STRING_STYLE_URL));
streams.out.append(L'\n');
nesc++;
}
@@ -533,8 +533,8 @@ static int string_escape_var(options_t &opts, int optind, wchar_t **argv, io_str
escape_flags_t flags = 0;
arg_iterator_t aiter(argv, optind, streams);
while (const wchar_t *arg = aiter.next()) {
streams.out.append(escape_string(arg, flags, STRING_STYLE_VAR));
while (auto arg = aiter.nextstr()) {
streams.out.append(escape_string(*arg, flags, STRING_STYLE_VAR));
streams.out.append(L'\n');
nesc++;
}