patch 9.1.0309: crash when 'textwidth' > MAX_INT

Problem:  crash when 'textwidth' > MAX_INT (after vv9.1.0055)
          (Zoltan Balogh)
Solution: limit textwidth to MAX_INT

fixes: #14482
closes: #14489

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_textformat.vim b/src/testdir/test_textformat.vim
index c5f597580154bc7970da6f5d3d2920bffa377db7..a9cffd0e6f5d9619fcf4d62be5fa26d43ce34bba 100644 (file)
--- a/src/testdir/test_textformat.vim
+++ b/src/testdir/test_textformat.vim
@@ -1303,4 +1303,13 @@ func Test_correct_cursor_position()
   set encoding=utf8
 endfunc
 
+" This was crashing Vim
+func Test_textwdith_overflow()
+  new
+  setl tw=999999999
+  normal 10ig
+  call feedkeys('a ab cd ef', 'xt')
+  bw!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/textformat.c b/src/textformat.c
index 14acc53cd0592af5ed16601ded4607fe88da0a1b..41ec2cfe4be98085802ab05a06183d7526c0c8f8 100644 (file)
--- a/src/textformat.c
+++ b/src/textformat.c
@@ -56,6 +56,7 @@ internal_format(
     colnr_T    leader_len;
     int                no_leader = FALSE;
     int                do_comments = (flags & INSCHAR_DO_COM);
+    int                safe_tw = trim_to_int(8 * (vimlong_T)textwidth);
 #ifdef FEAT_LINEBREAK
     int                has_lbr = curwin->w_p_lbr;
 
@@ -95,7 +96,7 @@ internal_format(
        // Cursor is currently at the end of line. No need to format
        // if line length is less than textwidth (8 * textwidth for
        // utf safety)
-       if (curwin->w_cursor.col < 8 * textwidth)
+       if (curwin->w_cursor.col < safe_tw)
        {
            virtcol = get_nolist_virtcol()
                + char2cells(c != NUL ? c : gchar_cursor());
@@ -156,8 +157,7 @@ internal_format(
        // line to textwidth border every time for each line break.
        //
        // Ceil to 8 * textwidth to optimize.
-       curwin->w_cursor.col = startcol < 8 * textwidth ? startcol :
-           8 * textwidth;
+       curwin->w_cursor.col = startcol < safe_tw ? startcol : safe_tw;
 
        foundcol = 0;
        skip_pos = 0;

diff --git a/src/version.c b/src/version.c
index 87e98d5f6f0db52925d7d704abd822ce34a86d9e..b9db49e15ed03c780050e8ce10c433244d0a1b14 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    309,
 /**/
     308,
 /**/