commit f97ddbeb255c64a2b3d9db4b049278cd286070a6
author Bram Moolenaar <Bram@vim.org> Sat Feb 27 21:13:38 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Feb 27 21:13:38 2016 +0100
tree 5c6409abe9ec0dc3f92777037753c180a2819a99
parent c7f0ebc6d1e1cdaed816b88a0d6092c5ace615eb

patch 7.4.1439
Problem:    Using uninitialzed variable.
Solution:   Initialize vc_type.

src/json.c

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 != '"')
     {