diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-04-12 16:21:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-04-12 16:21:14 +0100 |
| commit | ac6cd31afcbdd08bfa92ca33f7d4ce5773ba4353 (patch) | |
| tree | 3f9358e8fd2a2cf3450a79b7aa184d9224d6845d | |
| parent | 05a627c3d4e42a18f76c14828d68ee4747118211 (diff) | |
patch 9.0.1444: crash when passing NULL to setcmdline()v9.0.1444
Problem: Crash when passing NULL to setcmdline(). (Andreas Louv)
Solution: Use tv_get_string() instead of using v_string directly.
(closes #12231, closes #12227)
| -rw-r--r-- | src/ex_getln.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index dc933d745f..36d148e79d 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4294,7 +4294,8 @@ f_setcmdline(typval_T *argvars, typval_T *rettv) } } - rettv->vval.v_number = set_cmdline_str(argvars[0].vval.v_string, pos); + // Use tv_get_string() to handle a NULL string like an empty string. + rettv->vval.v_number = set_cmdline_str(tv_get_string(&argvars[0]), pos); } /* diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index ddcb260451..8b47d86e1c 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -3393,6 +3393,14 @@ endfunc func Test_setcmdline() func SetText(text, pos) + call assert_equal(0, setcmdline(test_null_string())) + call assert_equal('', getcmdline()) + call assert_equal(1, getcmdpos()) + + call assert_equal(0, setcmdline(''[: -1])) + call assert_equal('', getcmdline()) + call assert_equal(1, getcmdpos()) + autocmd CmdlineChanged * let g:cmdtype = expand('<afile>') call assert_equal(0, setcmdline(a:text)) call assert_equal(a:text, getcmdline()) diff --git a/src/version.c b/src/version.c index eba3db43c3..b5df8c5160 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1444, +/**/ 1443, /**/ 1442, |