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

patch 7.4.1439

Browse Source 
Problem:    Using uninitialzed variable.
Solution:   Initialize vc_type.
This commit is contained in:
Bram Moolenaar
2016-02-27 21:13:38 +01:00
parent c7f0ebc6d1
commit f97ddbeb25
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/json.c
View File

@@ -83,12 +83,15 @@ write_string(garray_T *gap, char_u *str)
vimconv_T conv; vimconv_T conv;
char_u *converted = NULL; char_u *converted = NULL;
if (!enc_utf8)
{
conv.vc_type = CONV_NONE;
convert_setup(&conv, p_enc, (char_u*)"utf-8"); convert_setup(&conv, p_enc, (char_u*)"utf-8");
if (conv.vc_type != CONV_NONE) if (conv.vc_type != CONV_NONE)
converted = res = string_convert(&conv, res, NULL); converted = res = string_convert(&conv, res, NULL);
convert_setup(&conv, NULL, NULL); convert_setup(&conv, NULL, NULL);
}
#endif #endif
ga_append(gap, '"'); ga_append(gap, '"');
while (*res != NUL) while (*res != NUL)
{ {
@@ -540,10 +543,14 @@ json_decode_string(js_read_T *reader, typval_T *res)
p = reader->js_buf + reader->js_used + 1; /* skip over " */ p = reader->js_buf + reader->js_used + 1; /* skip over " */
#if defined(FEAT_MBYTE) && defined(USE_ICONV) #if defined(FEAT_MBYTE) && defined(USE_ICONV)
if (!enc_utf8)
{
conv.vc_type = CONV_NONE;
convert_setup(&conv, (char_u*)"utf-8", p_enc); convert_setup(&conv, (char_u*)"utf-8", p_enc);
if (conv.vc_type != CONV_NONE) if (conv.vc_type != CONV_NONE)
converted = p = string_convert(&conv, p, NULL); converted = p = string_convert(&conv, p, NULL);
convert_setup(&conv, NULL, NULL); convert_setup(&conv, NULL, NULL);
}
#endif #endif
while (*p != '"') while (*p != '"')
{ {

2
src/version.c
View File

@@ -743,6 +743,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 */
/**/
1439,
/**/ /**/
1438, 1438,
/**/ /**/