patch 9.0.0558: Coverity warns for possibly using NULL pointer

Problem:    Coverity warns for possibly using NULL pointer.
Solution:   Only use "evalarg" when not NULL.

diff --git a/src/eval.c b/src/eval.c
index d369df5e01d17ee36e703f7c6b6dca59bf8854dd..0102bd70b5cb8ef729007424d02718c28c1b7421 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -6380,7 +6380,8 @@ handle_subscript(
            **arg = NUL;
 
            idx = find_exported(rettv->vval.v_number, exp_name, &ufunc, &type,
-                           evalarg->eval_cctx, evalarg->eval_cstack, verbose);
+                      evalarg == NULL ? NULL : evalarg->eval_cctx,
+                      evalarg == NULL ? NULL : evalarg->eval_cstack, verbose);
            **arg = cc;
 
            if (idx < 0 && ufunc == NULL)

diff --git a/src/version.c b/src/version.c
index f01afe3862bebfb20769347f3a27b0f6745f5ff3..48f2ca559beda0815880dbca8859732f36964607 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    558,
 /**/
     557,
 /**/