mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 23:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

encode: Handle incomplete surrogates like \uSURR\uOTHR properly

Browse Source
This commit is contained in:
ZyX
2016-02-25 17:27:23 +03:00
parent 406562ac6d
commit 942e0b338c
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/eval/decode.c
View File

@@ -459,12 +459,16 @@ json_decode_string_cycle_start:
int fst_in_pair = 0;
char *str_end = str;
bool hasnul = false;
#define PUT_FST_IN_PAIR(fst_in_pair, str_end) \
do { \
if (fst_in_pair != 0) { \
str_end += utf_char2bytes(fst_in_pair, (char_u *) str_end); \
fst_in_pair = 0; \
} \
} while (0)
for (const char *t = s; t < p; t++) {
if (t[0] != '\\' || t[1] != 'u') {
if (fst_in_pair != 0) {
str_end += utf_char2bytes(fst_in_pair, (char_u *) str_end);
fst_in_pair = 0;
}
PUT_FST_IN_PAIR(fst_in_pair, str_end);
}
if (*t == '\\') {
t++;
@@ -489,6 +493,7 @@ json_decode_string_cycle_start:
str_end += utf_char2bytes(full_char, (char_u *) str_end);
fst_in_pair = 0;
} else {
PUT_FST_IN_PAIR(fst_in_pair, str_end);
str_end += utf_char2bytes((int) ch, (char_u *) str_end);
}
break;
@@ -522,9 +527,8 @@ json_decode_string_cycle_start:
*str_end++ = *t;
}
}
if (fst_in_pair != 0) {
str_end += utf_char2bytes((int) fst_in_pair, (char_u *) str_end);
}
PUT_FST_IN_PAIR(fst_in_pair, str_end);
#undef PUT_FST_IN_PAIR
if (conv.vc_type != CONV_NONE) {
size_t str_len = (size_t) (str_end - str);
char *const new_str = (char *) string_convert(&conv, (char_u *) str,

2
test/functional/eval/json_functions_spec.lua
View File

@@ -386,6 +386,8 @@ describe('json_decode() function', function()
eq('\xED\xB0\x80', funcs.json_decode('"\\uDC00"'))
eq('a\xED\xB0\x80', funcs.json_decode('"a\\uDC00"'))
eq('\t\xED\xB0\x80', funcs.json_decode('"\\t\\uDC00"'))
eq('\xED\xA0\x80¬', funcs.json_decode('"\\uD800\\u00AC"'))
end)
local sp_decode_eq = function(expected, json)