github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix crash in string pad

Browse Source 
Try:

    string pad -w 8 he \eh
This commit is contained in:
Fabian Homborg 2021-03-09 18:32:15 +01:00
parent a7df92e187
commit daa3cc17c4
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/builtin_string.cpp
View File

@ -183,7 +183,7 @@ struct options_t { //!OCLINT(too many fields)
long max = 0; long max = 0;
long start = 0; long start = 0;
long end = 0; long end = 0;
size_t width = 0; ssize_t width = 0;
wchar_t char_to_pad = L' '; wchar_t char_to_pad = L' ';
@ -1181,24 +1181,24 @@ static int string_pad(parser_t &parser, io_streams_t &streams, int argc, wchar_t
} }
// Find max width of strings and keep the inputs // Find max width of strings and keep the inputs
size_t max_width = 0; ssize_t max_width = 0;
std::vector<wcstring> inputs; std::vector<wcstring> inputs;
arg_iterator_t aiter_width(argv, optind, streams); arg_iterator_t aiter_width(argv, optind, streams);
while (const wcstring *arg = aiter_width.nextstr()) { while (const wcstring *arg = aiter_width.nextstr()) {
wcstring input_string = *arg; wcstring input_string = *arg;
size_t width = fish_wcswidth(input_string); ssize_t width = fish_wcswidth(input_string);
if (width > max_width) max_width = width; if (width > max_width) max_width = width;
inputs.push_back(std::move(input_string)); inputs.push_back(std::move(input_string));
} }
size_t pad_width = max_width > opts.width ? max_width : opts.width; ssize_t pad_width = max_width > opts.width ? max_width : opts.width;
for (auto &input : inputs) { for (auto &input : inputs) {
wcstring padded; wcstring padded;
size_t padded_width = fish_wcswidth(input); ssize_t padded_width = fish_wcswidth(input);
if (pad_width >= padded_width) { if (pad_width >= padded_width) {
size_t pad = (pad_width - padded_width) / pad_char_width; ssize_t pad = (pad_width - padded_width) / pad_char_width;
size_t remaining_width = (pad_width - padded_width) % pad_char_width; ssize_t remaining_width = (pad_width - padded_width) % pad_char_width;
if (opts.left) { if (opts.left) {
padded.append(pad, opts.char_to_pad); padded.append(pad, opts.char_to_pad);
padded.append(remaining_width, L' '); padded.append(remaining_width, L' ');

5
tests/checks/string.fish
View File

@ -713,3 +713,8 @@ end
string escape \x7F string escape \x7F
# CHECK: \x7f # CHECK: \x7f
# This used to crash.
string pad -w 8 he \eh
# CHECK: he
# CHECK: {{\x1bh}}