patch 7.4.1439

Problem:    Using uninitialzed variable.
Solution:   Initialize vc_type.

diff --git a/src/json.c b/src/json.c
index a704fd5eb520c40109bfccde356dfab906ff72ca..36876455b5691876de1289a4596fd17bf4e2dc49 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -83,12 +83,15 @@ write_string(garray_T *gap, char_u *str)
        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 @@ json_decode_string(js_read_T *reader, typval_T *res)
 
     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 db96b03a431f4ddcfa65b0228b76f307434bb5e8..28e16be6e3d6ffe37ea708eff1f7ebcaf8722ef5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1439,
 /**/
     1438,
 /**/