changeset 16815:6fdb0ae0cac3 v8.1.1409

patch 8.1.1409: Coverity warns for using uninitialized memory commit https://github.com/vim/vim/commit/b43683729b64f83c39840524be232388314bd71f Author: Bram Moolenaar <Bram@vim.org> Date: Mon May 27 20:01:41 2019 +0200 patch 8.1.1409: Coverity warns for using uninitialized memory Problem: Coverity warns for using uninitialized memory. Solution: Add a condition to clearing the growarray.
author Bram Moolenaar <Bram@vim.org>
date Mon, 27 May 2019 20:15:05 +0200
parents 575d1863656c
children b951a6ebd627
files src/json.c src/version.c
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/json.c
+++ b/src/json.c
@@ -455,7 +455,8 @@ json_decode_string(js_read_T *reader, ty
 			     STR2NR_HEX + STR2NR_FORCE, &nr, NULL, 4, TRUE);
 		    if (len == 0)
 		    {
-			ga_clear(&ga);
+			if (res != NULL)
+			    ga_clear(&ga);
 			return FAIL;
 		    }
 		    p += len + 2;
@@ -471,7 +472,8 @@ json_decode_string(js_read_T *reader, ty
 			     STR2NR_HEX + STR2NR_FORCE, &nr2, NULL, 4, TRUE);
 			if (len == 0)
 			{
-			    ga_clear(&ga);
+			    if (res != NULL)
+				ga_clear(&ga);
 			    return FAIL;
 			}
 			if (0xdc00 <= nr2 && nr2 <= 0xdfff)
@@ -484,6 +486,7 @@ json_decode_string(js_read_T *reader, ty
 		    if (res != NULL)
 		    {
 			char_u	buf[NUMBUFLEN];
+
 			buf[utf_char2bytes((int)nr, buf)] = NUL;
 			ga_concat(&ga, buf);
 		    }
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1409,
+/**/
     1408,
 /**/
     1407,