Mercurial > vim
changeset 32226:a5b5d8df5763 v9.0.1444
patch 9.0.1444: crash when passing NULL to setcmdline()
Commit: https://github.com/vim/vim/commit/ac6cd31afcbdd08bfa92ca33f7d4ce5773ba4353
Author: zeertzjq <zeertzjq@outlook.com>
Date: Wed Apr 12 16:21:14 2023 +0100
patch 9.0.1444: crash when passing NULL to setcmdline()
Problem: Crash when passing NULL to setcmdline(). (Andreas Louv)
Solution: Use tv_get_string() instead of using v_string directly.
(closes #12231, closes #12227)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 12 Apr 2023 17:30:04 +0200 |
| parents | 07e248d5b72b |
| children | 48a24e06533f |
| files | src/ex_getln.c src/testdir/test_cmdline.vim src/version.c |
| diffstat | 3 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4294,7 +4294,8 @@ f_setcmdline(typval_T *argvars, typval_T } } - 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); } /*
--- 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())