diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-12-15 21:25:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-12-15 21:25:01 +0100 |
| commit | b29d328eb403a243431f4d0d5b360b4ac46bbc3e (patch) | |
| tree | 9f854ad29aa20a0375794c6189e997d4eb08d2fb | |
| parent | 4697399e8c805325009351a2488e3da530d0af38 (diff) | |
| download | vim-git-b29d328eb403a243431f4d0d5b360b4ac46bbc3e.tar.gz | |
patch 8.0.1391: encoding empty string to JSON sometimes gives "null"v8.0.1391
Problem: Encoding empty string to JSON sometimes gives "null".
Solution: Handle NULL string as empty string. (closes #2446)
| -rw-r--r-- | src/json.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_json.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/json.c b/src/json.c index e5e85eb6d..6f914ea03 100644 --- a/src/json.c +++ b/src/json.c @@ -92,7 +92,7 @@ write_string(garray_T *gap, char_u *str) char_u numbuf[NUMBUFLEN]; if (res == NULL) - ga_concat(gap, (char_u *)"null"); + ga_concat(gap, (char_u *)"\"\""); else { #if defined(FEAT_MBYTE) && defined(USE_ICONV) @@ -237,7 +237,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options) case VAR_LIST: l = val->vval.v_list; if (l == NULL) - ga_concat(gap, (char_u *)"null"); + ga_concat(gap, (char_u *)"[]"); else { if (l->lv_copyID == copyID) @@ -272,7 +272,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options) case VAR_DICT: d = val->vval.v_dict; if (d == NULL) - ga_concat(gap, (char_u *)"null"); + ga_concat(gap, (char_u *)"{}"); else { if (d->dv_copyID == copyID) diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim index 6c3d16ce5..acd2ea85b 100644 --- a/src/testdir/test_json.vim +++ b/src/testdir/test_json.vim @@ -103,6 +103,10 @@ func Test_json_encode() call assert_fails('echo json_encode(function("tr"))', 'E474:') call assert_fails('echo json_encode([function("tr")])', 'E474:') + call assert_equal('{"a":""}', json_encode({'a': test_null_string()})) + call assert_equal('{"a":[]}', json_encode({"a": test_null_list()})) + call assert_equal('{"a":{}}', json_encode({"a": test_null_dict()})) + silent! let res = json_encode(function("tr")) call assert_equal("", res) endfunc diff --git a/src/version.c b/src/version.c index 16ba82a3b..af507e4b7 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1391, +/**/ 1390, /**/ 1389, |