patch 9.0.1846: [security] crash in fullcommand

Problem:  crash in fullcommand
Solution: Check for typeval correctly

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 32d52ab21218092981b8f485647070da252b8657..10d979d493ac7c66a2f808c9369bcbeb84d27fd1 100644 (file)
--- 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 0eda5de380e9d087538e40495b6b27e33add6a15..ab1dbf3b59851776833ea903567d398d3dad3aa6 100644 (file)
--- 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 3de6046ffb02f577d97308e24423f9b574a45941..5cde7c18552595405b8792a9df59112fbf69604c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1846,
 /**/
     1845,
 /**/