patch 7.4.1446

brammool · brammool · commit 80e78847395b · 2016-02-28T15:21:13.000+01:00
Problem:    Crash when using json_decode().
Solution:   Terminate string with a NUL byte.
diff --git 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
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1446,
 /**/
     1445,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -659,6 +659,7 @@ json_decode_string(js_read_T reader, typval_T res)`
`659`	`659`	`++reader->js_used;`
`660`	`660`	`if (res != NULL)`
`661`	`661`	`{`
	`662`	`+ ga_append(&ga, NUL);`
`662`	`663`	`res->v_type = VAR_STRING;`
`663`	`664`	`#if defined(FEAT_MBYTE) && defined(USE_ICONV)`
`664`	`665`	`if (!enc_utf8)`