From daa3cc17c4b21ba56649832dc0d37dca0032c77a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 9 Mar 2021 18:32:15 +0100
Subject: [PATCH] Fix crash in string pad

Try:

    string pad -w 8 he \eh
---
 src/builtin_string.cpp   | 14 +++++++-------
 tests/checks/string.fish |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 779274a76..c0062f37a 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -183,7 +183,7 @@ struct options_t {  //!OCLINT(too many fields)
     long max = 0;
     long start = 0;
     long end = 0;
-    size_t width = 0;
+    ssize_t width = 0;
 
     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
-    size_t max_width = 0;
+    ssize_t max_width = 0;
     std::vector<wcstring> inputs;
 
     arg_iterator_t aiter_width(argv, optind, streams);
     while (const wcstring *arg = aiter_width.nextstr()) {
         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;
         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) {
         wcstring padded;
-        size_t padded_width = fish_wcswidth(input);
+        ssize_t padded_width = fish_wcswidth(input);
         if (pad_width >= padded_width) {
-            size_t pad = (pad_width - padded_width) / pad_char_width;
-            size_t remaining_width = (pad_width - padded_width) % pad_char_width;
+            ssize_t pad = (pad_width - padded_width) / pad_char_width;
+            ssize_t remaining_width = (pad_width - padded_width) % pad_char_width;
             if (opts.left) {
                 padded.append(pad, opts.char_to_pad);
                 padded.append(remaining_width, L' ');
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index c0cec01a5..f08cd9bfc 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -713,3 +713,8 @@ end
 
 string escape \x7F
 # CHECK: \x7f
+
+# This used to crash.
+string pad -w 8 he \eh
+# CHECK: he
+# CHECK: {{\x1bh}}