# HG changeset patch # User Christian Brabandt # Date 1456669805 -3600 # Node ID c1f29c1a968ae3601ff49bf2acd8f650b75f99d0 # Parent 702fdaf67f99447157138f22185cd4fc483329a1 commit https://github.com/vim/vim/commit/80e78847395b5c8ada7861674774d81bd0a42789 Author: Bram Moolenaar Date: Sun Feb 28 15:21:13 2016 +0100 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 --- a/src/json.c +++ b/src/json.c @@ -659,6 +659,7 @@ json_decode_string(js_read_T *reader, ty ++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 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1446, +/**/ 1445, /**/ 1444,