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: Free memory just in case

Browse Source 
After string_convert() with .vc_fail=true these blocks should never be entered 
because they indicate invalid unicode.
This commit is contained in:
ZyX
2016-02-11 01:38:58 +03:00
parent 209427e972
commit 4913a25dec
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -927,12 +927,14 @@ static inline int convert_to_json_string(garray_T *const gap,
emsgf(_("E474: String \"%.*s\" contains byte that does not start " emsgf(_("E474: String \"%.*s\" contains byte that does not start "
"any UTF-8 character"), "any UTF-8 character"),
utf_len - (i - shift), utf_buf + i - shift); utf_len - (i - shift), utf_buf + i - shift);
xfree(tofree);
return FAIL; return FAIL;
} else if ((SURROGATE_HI_START <= ch && ch <= SURROGATE_HI_END) } else if ((SURROGATE_HI_START <= ch && ch <= SURROGATE_HI_END)
|| (SURROGATE_LO_START <= ch && ch <= SURROGATE_LO_END)) { || (SURROGATE_LO_START <= ch && ch <= SURROGATE_LO_END)) {
emsgf(_("E474: UTF-8 string contains code point which belongs " emsgf(_("E474: UTF-8 string contains code point which belongs "
"to a surrogate pair: %.*s"), "to a surrogate pair: %.*s"),
utf_len - (i - shift), utf_buf + i - shift); utf_len - (i - shift), utf_buf + i - shift);
xfree(tofree);
return FAIL; return FAIL;
} else if (ENCODE_RAW(p_enc_conv, ch)) { } else if (ENCODE_RAW(p_enc_conv, ch)) {
str_len += shift; str_len += shift;