diff options
| author | Kristoffer Haugsbakk <code@khaugsbakk.name> | 2024-02-13 16:01:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-13 18:18:50 (GMT) |
| commit | f2d31c69ce38e4515d5dfac34c69423c833b85f9 (patch) | |
| tree | 5a941b48743d03b6a1a52bbe24f592d242fbea47 | |
| parent | 7adf215fede93114f8ee376c82adb5b8dd0f73c7 (diff) | |
| download | git-f2d31c69ce38e4515d5dfac34c69423c833b85f9.zip git-f2d31c69ce38e4515d5dfac34c69423c833b85f9.tar.gz git-f2d31c69ce38e4515d5dfac34c69423c833b85f9.tar.bz2 | |
column: disallow negative padding
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 <tiago@pascoal.net>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/column.c | 2 | ||||
| -rwxr-xr-x | t/t9002-column.sh | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/builtin/column.c b/builtin/column.c index e80218f..10ff7e0 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 348cc40..d5b98e6 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 <input >actual 2>&1 && + test_cmp expected actual +' + test_done |