summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-02-15 14:26:25 +0000
committerBram Moolenaar <Bram@vim.org>2023-02-15 14:26:25 +0000
commit339e114d70de3ec2b36edf37d7ba7a7cfdf9d1a6 (patch)
tree1ec594b0d2603f50ceb760fddbb8c0ceb6455a2d
parentfdbd14e89207dca95549f298ee468793da852086 (diff)
downloadvim-git-339e114d70de3ec2b36edf37d7ba7a7cfdf9d1a6.tar.gz
patch 9.0.1311: Coverity warns for using a NULL pointerv9.0.1311
Problem: Coverity warns for using a NULL pointer. Solution: Use "empty_option" instead of NULL.
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 717812c9c..1b581ed35 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1990,6 +1990,8 @@ do_set_option_string(
// Set the new value.
*(char_u **)(varp) = newval;
+ if (newval == NULL)
+ *(char_u **)(varp) = empty_option;
#if defined(FEAT_EVAL)
if (!starting
diff --git a/src/version.c b/src/version.c
index a6451cb6a..c59a3a1df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1311,
+/**/
1310,
/**/
1309,