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 d5019285b9c54c544666753b723501da3bc963e8..cf887e5afd9394813d5ecf47ababfad607eb17f8 100644 (file)
--- 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 ffb28048067561f4ef22f92f7c2d777ce96a24af..d13cfb7da804ee1be0bb330778e58e3c7d562b49 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 */
+/**/
+    1446,
 /**/
     1445,
 /**/