From ac6cd31afcbdd08bfa92ca33f7d4ce5773ba4353 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 12 Apr 2023 16:21:14 +0100 Subject: [PATCH] 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) --- src/ex_getln.c | 3 ++- src/testdir/test_cmdline.vim | 8 ++++++++ src/version.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) 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('') 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 @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1444, /**/ 1443, /**/ -- 2.47.2