commit b29d328eb403a243431f4d0d5b360b4ac46bbc3e
author Bram Moolenaar <Bram@vim.org> Fri Dec 15 21:25:01 2017 +0100
committer Bram Moolenaar <Bram@vim.org> Fri Dec 15 21:25:01 2017 +0100
tree 9f854ad29aa20a0375794c6189e997d4eb08d2fb
parent 4697399e8c805325009351a2488e3da530d0af38

patch 8.0.1391: encoding empty string to JSON sometimes gives "null"

Problem:    Encoding empty string to JSON sometimes gives "null".
Solution:   Handle NULL string as empty string. (closes #2446)

src/json.c

diff --git a/src/json.c b/src/json.c
index e5e85eb..6f914ea 100644
--- a/src/json.c
+++ b/src/json.c
@@ -92,7 +92,7 @@
     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 @@
 	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 @@
 	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)