From: Bram Moolenaar Date: Sun, 26 Nov 2017 15:53:16 +0000 (+0100) Subject: patch 8.0.1346: crash when passing 50 char string to balloon_split() X-Git-Tag: v8.0.1346 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3571ebef5a2969d16e3e202ec4bca8858aca6ba;p=vim patch 8.0.1346: crash when passing 50 char string to balloon_split() Problem: Crash when passing 50 char string to balloon_split(). Solution: Fix off-by-one error. --- diff --git a/src/popupmnu.c b/src/popupmnu.c index 77460a1a6..447f789e5 100644 --- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -836,7 +836,7 @@ split_message(char_u *mesg, pumitem_T **array) item->bytelen = p - item->start; if (item->cells > max_cells) max_cells = item->cells; - long_item_count += item->cells / BALLOON_MIN_WIDTH; + long_item_count += (item->cells - 1) / BALLOON_MIN_WIDTH; } height = 2 + ga.ga_len; diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index 2bb9b32c4..6250c1b8f 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -707,6 +707,10 @@ func Test_balloon_split() if !exists('*balloon_split') return endif + call assert_equal([ + \ 'tempname: 0x555555e380a0 "/home/mool/.viminfz.tmp"', + \ ], balloon_split( + \ 'tempname: 0x555555e380a0 "/home/mool/.viminfz.tmp"')) call assert_equal([ \ 'one two three four one two three four one two thre', \ 'e four', diff --git a/src/version.c b/src/version.c index 5b3b7977b..55754faa0 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1346, /**/ 1345, /**/