changeset 19219:89931701e033 v8.2.0168

patch 8.2.0168: Coverity warning for assigning NULL to an option Commit: https://github.com/vim/vim/commit/97a2af39cd3249c6cbe5a5c59bc24167632d39ad Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 28 22:52:48 2020 +0100 patch 8.2.0168: Coverity warning for assigning NULL to an option Problem: Coverity warning for assigning NULL to an option. Solution: Use empty string instead of NULL.
author Bram Moolenaar <Bram@vim.org>
date Tue, 28 Jan 2020 23:00:04 +0100
parents 4d35e5111ee6
children a9c67835a9d4
files src/testdir/test_vim9_expr.vim src/version.c src/vim9execute.c
diffstat 3 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -644,6 +644,8 @@ def Test_expr7_option()
   set ts=8
   set grepprg=some\ text
   assert_equal('some text', &grepprg)
+  &grepprg = test_null_string()
+  assert_equal('', &grepprg)
   set grepprg&
 enddef
 
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    168,
+/**/
     167,
 /**/
     166,
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -625,7 +625,11 @@ call_def_function(
 		    --ectx.ec_stack.ga_len;
 		    tv = STACK_TV_BOT(0);
 		    if (tv->v_type == VAR_STRING)
+		    {
 			s = tv->vval.v_string;
+			if (s == NULL)
+			    s = (char_u *)"";
+		    }
 		    else if (tv->v_type == VAR_NUMBER)
 			n = tv->vval.v_number;
 		    else