commit 7f009dfa064240d9024b76212535a35231912511
author Bram Moolenaar <Bram@vim.org> Mon Mar 16 20:27:38 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Mar 16 20:27:38 2020 +0100
tree d63e1265b93f65f405c08df6500e915776e7cc57
parent c0300633292ee648c7154a7828eb1c76637bd9af

patch 8.2.0394: Coverity complains about using NULL pointer

Problem:    Coverity complains about using NULL pointer.
Solution:   Use empty string when option value is NULL.

src/optionstr.c

diff --git a/src/optionstr.c b/src/optionstr.c
index af4b749..1cf1ee9 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -500,7 +500,7 @@
     if (is_hidden_option(opt_idx))	// don't set hidden option
 	return NULL;
 
-    s = vim_strsave(value);
+    s = vim_strsave(value == NULL ? (char_u *)"" : value);
     if (s != NULL)
     {
 	varp = (char_u **)get_option_varp_scope(opt_idx,

src/version.c

diff --git a/src/version.c b/src/version.c
index b0497a5..717ca66 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    394,
+/**/
     393,
 /**/
     392,