diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-01-28 22:52:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-01-28 22:52:48 +0100 |
| commit | 97a2af39cd3249c6cbe5a5c59bc24167632d39ad (patch) | |
| tree | 955011b497c516ac279a6242f93ba332e5b32b15 | |
| parent | 58ceca5cae75ed839b20a89c5fa9998f02552f58 (diff) | |
| download | vim-git-97a2af39cd3249c6cbe5a5c59bc24167632d39ad.tar.gz | |
patch 8.2.0168: Coverity warning for assigning NULL to an optionv8.2.0168
Problem: Coverity warning for assigning NULL to an option.
Solution: Use empty string instead of NULL.
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9execute.c | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 321dbf95a..8776e0747 100644 --- 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 index c6259bc9f..231640caa 100644 --- 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 index 6865ba1e2..480f1ec56 100644 --- 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 |