From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 30 Sep 2022 11:00:06 +0000 (+0100)
Subject: patch 9.0.0628: Coverity warns for not checking return value
X-Git-Tag: v9.0.0628
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0121c63cfb0922a7048ece3efe994df6f444bed;p=vim

patch 9.0.0628: Coverity warns for not checking return value

Problem:    Coverity warns for not checking return value.
Solution:   Check the return value and simplify the code.
---

diff --git a/src/version.c b/src/version.c
index a2e66b2d4..73093f46e 100644
--- 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 */
+/**/
+    628,
 /**/
     627,
 /**/
diff --git a/src/vim9type.c b/src/vim9type.c
index c4aec7b19..771fbf54b 100644
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -485,18 +485,13 @@ typval2type_int(typval_T *tv, int copyID, garray_T *type_gap, int flags)
 		    {
 			type->tt_argcount -= tv->vval.v_partial->pt_argc;
 			type->tt_min_argcount -= tv->vval.v_partial->pt_argc;
-			if (type->tt_argcount <= 0)
-			    type->tt_args = NULL;
-			else
-			{
-			    int i;
-
-			    func_type_add_arg_types(type, type->tt_argcount,
-								     type_gap);
-			    for (i = 0; i < type->tt_argcount; ++i)
-				type->tt_args[i] = ufunc->uf_func_type->tt_args[
+			if (type->tt_argcount > 0
+				&& func_type_add_arg_types(type,
+					    type->tt_argcount, type_gap) == OK)
+			    for (int i = 0; i < type->tt_argcount; ++i)
+				type->tt_args[i] =
+					ufunc->uf_func_type->tt_args[
 					      i + tv->vval.v_partial->pt_argc];
-			}
 		    }
 		    return type;
 		}