patch 7.4.1439
Problem: Using uninitialzed variable.
Solution: Initialize vc_type.
diff --git a/src/json.c b/src/json.c
index a704fd5..3687645 100644
--- a/src/json.c
+++ b/src/json.c
@@ -83,12 +83,15 @@
vimconv_T conv;
char_u *converted = NULL;
- convert_setup(&conv, p_enc, (char_u*)"utf-8");
- if (conv.vc_type != CONV_NONE)
- converted = res = string_convert(&conv, res, NULL);
- convert_setup(&conv, NULL, NULL);
+ if (!enc_utf8)
+ {
+ conv.vc_type = CONV_NONE;
+ convert_setup(&conv, p_enc, (char_u*)"utf-8");
+ if (conv.vc_type != CONV_NONE)
+ converted = res = string_convert(&conv, res, NULL);
+ convert_setup(&conv, NULL, NULL);
+ }
#endif
-
ga_append(gap, '"');
while (*res != NUL)
{
@@ -540,10 +543,14 @@
p = reader->js_buf + reader->js_used + 1; /* skip over " */
#if defined(FEAT_MBYTE) && defined(USE_ICONV)
- convert_setup(&conv, (char_u*)"utf-8", p_enc);
- if (conv.vc_type != CONV_NONE)
- converted = p = string_convert(&conv, p, NULL);
- convert_setup(&conv, NULL, NULL);
+ if (!enc_utf8)
+ {
+ conv.vc_type = CONV_NONE;
+ convert_setup(&conv, (char_u*)"utf-8", p_enc);
+ if (conv.vc_type != CONV_NONE)
+ converted = p = string_convert(&conv, p, NULL);
+ convert_setup(&conv, NULL, NULL);
+ }
#endif
while (*p != '"')
{
diff --git a/src/version.c b/src/version.c
index db96b03..28e16be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1439,
+/**/
1438,
/**/
1437,