aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 7.4.1166

Browse Source 
Problem:    Can't encode a Funcref into JSON.  jsonencode() doesn't handle the
            same list or dict twice properly.  (Nikolay Pavlov)
Solution:   Give an error.  Reset copyID when the list or dict is finished.
This commit is contained in:
Bram Moolenaar
2016-01-24 16:49:11 +01:00
parent 938ee834d3
commit fcaaae6b3f
4 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/json.c
View File

@@ -16,6 +16,7 @@
#include "vim.h"
#if defined(FEAT_EVAL) || defined(PROTO)
static int json_encode_item(garray_T *gap, typval_T *val, int copyID);
static void json_decode_item(js_read_T *reader, typval_T *res);
/*
@@ -83,7 +84,11 @@ write_string(garray_T *gap, char_u *str)
}
}
void
/*
* Encode "val" into "gap".
* Return FAIL or OK.
*/
static int
json_encode_item(garray_T *gap, typval_T *val, int copyID)
{
char_u numbuf[NUMBUFLEN];
@@ -94,7 +99,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID)
switch (val->v_type)
{
case VAR_SPECIAL:
switch(val->vval.v_number)
switch (val->vval.v_number)
{
case VVAL_FALSE: ga_concat(gap, (char_u *)"false"); break;
case VVAL_TRUE: ga_concat(gap, (char_u *)"true"); break;
@@ -115,8 +120,9 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID)
break;
case VAR_FUNC:
/* no JSON equivalent, skip */
break;
/* no JSON equivalent */
EMSG(_(e_invarg));
return FAIL;
case VAR_LIST:
l = val->vval.v_list;
@@ -134,12 +140,14 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID)
ga_append(gap, '[');
for (li = l->lv_first; li != NULL && !got_int; )
{
json_encode_item(gap, &li->li_tv, copyID);
if (json_encode_item(gap, &li->li_tv, copyID) == FAIL)
return FAIL;
li = li->li_next;
if (li != NULL)
ga_append(gap, ',');
}
ga_append(gap, ']');
l->lv_copyID = 0;
}
}
break;
@@ -172,10 +180,12 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID)
ga_append(gap, ',');
write_string(gap, hi->hi_key);
ga_append(gap, ':');
json_encode_item(gap, &dict_lookup(hi)->di_tv,
copyID);
if (json_encode_item(gap, &dict_lookup(hi)->di_tv,
copyID) == FAIL)
return FAIL;
}
ga_append(gap, '}');
d->dv_copyID = 0;
}
}
break;
@@ -187,7 +197,9 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID)
break;
#endif
default: EMSG2(_(e_intern2), "json_encode_item()"); break;
return FAIL;
}
return OK;
}
/*