From fc88df42f1ae64bcc4d6cbc0fbd3445f8c59afdf Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 5 Feb 2022 11:13:05 +0000 Subject: [PATCH] patch 8.2.4298: divide by zero with huge tabstop value Problem: Divide by zero with huge tabstop value. Solution: Reject tabstop value that overflows to zero. --- src/indent.c | 2 +- src/testdir/test_vartabs.vim | 10 ++++++++++ src/version.c | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/indent.c b/src/indent.c index b62308d2a4..9b137b0b42 100644 --- a/src/indent.c +++ b/src/indent.c @@ -71,7 +71,7 @@ tabstop_set(char_u *var, int **array) int n = atoi((char *)cp); // Catch negative values, overflow and ridiculous big values. - if (n < 0 || n > TABSTOP_MAX) + if (n <= 0 || n > TABSTOP_MAX) { semsg(_(e_invalid_argument_str), cp); vim_free(*array); diff --git a/src/testdir/test_vartabs.vim b/src/testdir/test_vartabs.vim index 3b8a9ce0b1..156233dca7 100644 --- a/src/testdir/test_vartabs.vim +++ b/src/testdir/test_vartabs.vim @@ -146,6 +146,16 @@ func Test_vartabs() bwipeout! endfunc +func Test_retab_invalid_arg() + new + call setline(1, "\ttext") + retab 0 + call assert_fails("retab -8", 'E487: Argument must be positive') + call assert_fails("retab 10000", 'E475:') + call assert_fails("retab 720575940379279360", 'E475:') + bwipe! +endfunc + func Test_vartabs_breakindent() CheckOption breakindent new diff --git a/src/version.c b/src/version.c index 95f2b5fd39..7df9eaa7af 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4298, /**/ 4297, /**/