# HG changeset patch # User Bram Moolenaar # Date 1580248804 -3600 # Node ID 89931701e0334e5c64fec5f6fe33f6d4b1b4682f # Parent 4d35e5111ee6d08972d9ecefc13730ec26f29f5e patch 8.2.0168: Coverity warning for assigning NULL to an option Commit: https://github.com/vim/vim/commit/97a2af39cd3249c6cbe5a5c59bc24167632d39ad Author: Bram Moolenaar 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. diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim --- 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 diff --git a/src/version.c b/src/version.c --- 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, diff --git a/src/vim9execute.c b/src/vim9execute.c --- 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