From f2d31c69ce38e4515d5dfac34c69423c833b85f9 Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Tue, 13 Feb 2024 17:01:20 +0100 Subject: [PATCH 1/2] column: disallow negative padding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A negative padding does not make sense and can cause errors in the memory allocator since it’s interpreted as an unsigned integer. Reported-by: Tiago Pascoal Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- builtin/column.c | 2 ++ t/t9002-column.sh | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/builtin/column.c b/builtin/column.c index e80218f81f..10ff7e0166 100644 --- a/builtin/column.c +++ b/builtin/column.c @@ -45,6 +45,8 @@ int cmd_column(int argc, const char **argv, const char *prefix) memset(&copts, 0, sizeof(copts)); copts.padding = 1; argc = parse_options(argc, argv, prefix, options, builtin_column_usage, 0); + if (copts.padding < 0) + die(_("%s must be non-negative"), "--padding"); if (argc) usage_with_options(builtin_column_usage, options); if (real_command || command) { diff --git a/t/t9002-column.sh b/t/t9002-column.sh index 348cc40658..d5b98e615b 100755 --- a/t/t9002-column.sh +++ b/t/t9002-column.sh @@ -196,4 +196,15 @@ EOF test_cmp expected actual ' +test_expect_success 'padding must be non-negative' ' + cat >input <<\EOF && +1 2 3 4 5 6 +EOF + cat >expected <<\EOF && +fatal: --padding must be non-negative +EOF + test_must_fail git column --mode=column --padding=-1 actual 2>&1 && + test_cmp expected actual +' + test_done From 76fb807faacc38661ddb1c561ed80930699146ec Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Tue, 13 Feb 2024 17:01:21 +0100 Subject: [PATCH 2/2] column: guard against negative padding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure that client code can’t pass in a negative padding by accident. Suggested-by: Rubén Justo Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- column.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/column.c b/column.c index ff2f0abf39..50bbccc92e 100644 --- a/column.c +++ b/column.c @@ -182,6 +182,8 @@ void print_columns(const struct string_list *list, unsigned int colopts, { struct column_options nopts; + if (opts && (0 > opts->padding)) + BUG("padding must be non-negative"); if (!list->nr) return; assert((colopts & COL_ENABLE_MASK) != COL_AUTO); @@ -361,6 +363,8 @@ int run_column_filter(int colopts, const struct column_options *opts) { struct strvec *argv; + if (opts && (0 > opts->padding)) + BUG("padding must be non-negative"); if (fd_out != -1) return -1;