thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1409: Coverity warns for using uninitialized memory

Browse Source 
Problem:    Coverity warns for using uninitialized memory.
Solution:   Add a condition to clearing the growarray.
This commit is contained in:
Bram Moolenaar
2019-05-27 20:01:41 +02:00
parent bf0ecb2cb6
commit b43683729b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/json.c
View File

@@ -455,7 +455,8 @@ json_decode_string(js_read_T *reader, typval_T *res, int quote)
STR2NR_HEX + STR2NR_FORCE, &nr, NULL, 4, TRUE); STR2NR_HEX + STR2NR_FORCE, &nr, NULL, 4, TRUE);
if (len == 0) if (len == 0)
{ {
ga_clear(&ga); if (res != NULL)
ga_clear(&ga);
return FAIL; return FAIL;
} }
p += len + 2; p += len + 2;
@@ -471,7 +472,8 @@ json_decode_string(js_read_T *reader, typval_T *res, int quote)
STR2NR_HEX + STR2NR_FORCE, &nr2, NULL, 4, TRUE); STR2NR_HEX + STR2NR_FORCE, &nr2, NULL, 4, TRUE);
if (len == 0) if (len == 0)
{ {
ga_clear(&ga); if (res != NULL)
ga_clear(&ga);
return FAIL; return FAIL;
} }
if (0xdc00 <= nr2 && nr2 <= 0xdfff) if (0xdc00 <= nr2 && nr2 <= 0xdfff)
@@ -484,6 +486,7 @@ json_decode_string(js_read_T *reader, typval_T *res, int quote)
if (res != NULL) if (res != NULL)
{ {
char_u buf[NUMBUFLEN]; char_u buf[NUMBUFLEN];
buf[utf_char2bytes((int)nr, buf)] = NUL; buf[utf_char2bytes((int)nr, buf)] = NUL;
ga_concat(&ga, buf); ga_concat(&ga, buf);
} }

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1409,
/**/ /**/
1408, 1408,
/**/ /**/