mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 21:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/encode: Fix invalid UTF-8 strings handling:

Browse Source 
1. Do not allow reading past buffer end when creating error messages.
2. Fix surrogate pairs range, avoid magic constants.
This commit is contained in:
ZyX
2016-02-11 01:29:09 +03:00
parent 77776b09c6
commit f0bd4a1494
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval/encode.c
View File

@@ -895,7 +895,8 @@ static inline int convert_to_json_string(garray_T *const gap,
if (p_enc_conv.vc_type != CONV_NONE) {
tofree = string_convert(&p_enc_conv, buf, &utf_len);
if (tofree == NULL) {
EMSG2(_("E474: Failed to convert string \"%s\" to UTF-8"), utf_buf);
emsgf(_("E474: Failed to convert string \"%.*s\" to UTF-8"),
utf_len, utf_buf);
return FAIL;
}
utf_buf = tofree;
@@ -930,18 +931,21 @@ static inline int convert_to_json_string(garray_T *const gap,
}
default: {
if (ch > 0x7F && shift == 1) {
EMSG2(_("E474: String \"%s\" contains byte that does not start any "
"UTF-8 character"), utf_buf);
emsgf(_("E474: String \"%.*s\" contains byte that does not start "
"any UTF-8 character"),
utf_len - (i - shift), utf_buf + i - shift);
return FAIL;
} else if ((0xD800 <= ch && ch <= 0xDB7F)
|| (0xDC00 <= ch && ch <= 0xDFFF)) {
EMSG2(_("E474: UTF-8 string contains code point which belongs "
"to surrogate pairs: %s"), utf_buf + i);
} else if ((SURROGATE_HI_START <= ch && ch <= SURROGATE_HI_END)
|| (SURROGATE_LO_START <= ch && ch <= SURROGATE_LO_END)) {
emsgf(_("E474: UTF-8 string contains code point which belongs "
"to a surrogate pair: %.*s"),
utf_len - (i - shift), utf_buf + i - shift);
return FAIL;
} else if (ENCODE_RAW(p_enc_conv, ch)) {
str_len += shift;
} else {
str_len += ((sizeof("\\u1234") - 1) * (size_t) (1 + (ch > 0xFFFF)));
str_len += ((sizeof("\\u1234") - 1)
* (size_t) (1 + (ch >= SURROGATE_FIRST_CHAR)));
}
break;
}