From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 28 Feb 2016 14:21:13 +0000 (+0100)
Subject: patch 7.4.1446
X-Git-Tag: v7.4.1446
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e78847395b5c8ada7861674774d81bd0a42789;p=thirdparty%2Fvim.git

patch 7.4.1446
Problem:    Crash when using json_decode().
Solution:   Terminate string with a NUL byte.
---

diff --git a/src/json.c b/src/json.c
index d5019285b9..cf887e5afd 100644
--- a/src/json.c
+++ b/src/json.c
@@ -659,6 +659,7 @@ json_decode_string(js_read_T *reader, typval_T *res)
 	++reader->js_used;
 	if (res != NULL)
 	{
+	    ga_append(&ga, NUL);
 	    res->v_type = VAR_STRING;
 #if defined(FEAT_MBYTE) && defined(USE_ICONV)
 	    if (!enc_utf8)
diff --git a/src/version.c b/src/version.c
index ffb2804806..d13cfb7da8 100644
--- 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 */
+/**/
+    1446,
 /**/
     1445,
 /**/