# HG changeset patch # User Christian Brabandt # Date 1491856203 -7200 # Node ID 251f1833db7da77fcf8729ef0e49639ccc9ae0c6 # Parent 9f40755e5429e137d0e3a393c4a77e7726de4c84 patch 8.0.0561: undefined behavior when using backslash after empty line commit https://github.com/vim/vim/commit/478af67dd6a9adc456464c3736bda328ae3a28cb Author: Bram Moolenaar Date: Mon Apr 10 22:22:42 2017 +0200 patch 8.0.0561: undefined behavior when using backslash after empty line Problem: Undefined behavior when using backslash after empty line. Solution: Check for an empty line. (Dominique Pelle, closes https://github.com/vim/vim/issues/1631) diff --git a/src/misc2.c b/src/misc2.c --- a/src/misc2.c +++ b/src/misc2.c @@ -2129,7 +2129,7 @@ ga_concat(garray_T *gap, char_u *s) { int len; - if (s == NULL) + if (s == NULL || *s == NUL) return; len = (int)STRLEN(s); if (ga_grow(gap, len) == OK) diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -1310,6 +1310,17 @@ func Test_script_lines() endfunc "------------------------------------------------------------------------------- +" Test 96: line continuation {{{1 +" +" Undefined behavior was detected by ubsan with line continuation +" after an empty line. +"------------------------------------------------------------------------------- +func Test_script_emty_line_continuation() + + \ +endfunc + +"------------------------------------------------------------------------------- " Modelines {{{1 " vim: ts=8 sw=4 tw=80 fdm=marker " vim: fdt=substitute(substitute(foldtext(),\ '\\%(^+--\\)\\@<=\\(\\s*\\)\\(.\\{-}\\)\:\ \\%(\"\ \\)\\=\\(Test\ \\d*\\)\:\\s*',\ '\\3\ (\\2)\:\ \\1',\ \"\"),\ '\\(Test\\s*\\)\\(\\d\\)\\D\\@=',\ '\\1\ \\2',\ "") diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 561, +/**/ 560, /**/ 559,