diff options
| author | Christian Brabandt <cb@256bit.org> | 2023-09-02 19:30:03 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-02 19:30:03 +0200 |
| commit | 4c6fe2e2ea62469642ed1d80b16d39e616b25cf5 (patch) | |
| tree | cb789279b846ecdad1c3810564fd9c2df2dea355 | |
| parent | e0bfb7d3016ccd6c2186b9cd74cee6538eea9b5e (diff) | |
patch 9.0.1846: [security] crash in fullcommandv9.0.1846
Problem: crash in fullcommand
Solution: Check for typeval correctly
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 32d52ab212..10d979d493 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -4087,7 +4087,7 @@ f_fullcommand(typval_T *argvars, typval_T *rettv) || check_for_opt_bool_arg(argvars, 1) == FAIL)) return; - name = argvars[0].vval.v_string; + name = tv_get_string(&argvars[0]); if (name == NULL) return; diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 0eda5de380..ab1dbf3b59 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -3607,4 +3607,9 @@ func Test_string_reverse() let &encoding = save_enc endfunc +func Test_fullcommand() + " this used to crash vim + call assert_equal('', fullcommand(10)) +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 3de6046ffb..5cde7c1855 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1846, +/**/ 1845, /**/ 1844, |