mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-25 04:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/encode: Fix writing strings starting with NL to list

Browse Source 
Error [found][1] by oni-link.

[1]: https://github.com/neovim/neovim/pull/4131/files#r52239384
This commit is contained in:
ZyX
2016-02-09 03:20:16 +03:00
parent c27395ddc8
commit 77776b09c6
5 changed files with 192 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,11 +79,9 @@ int encode_list_write(void *data, const char *buf, size_t len)
do {
const char *line_start = line_end;
line_end = xmemscan(line_start, NL, (size_t) (end - line_start));
if (line_end == line_start) {
list_append_allocated_string(list, NULL);
} else {
char *str = NULL;
if (line_end != line_start) {
const size_t line_length = (size_t) (line_end - line_start);
char *str;
if (li == NULL) {
str = xmemdupz(line_start, line_length);
} else {
@@ -93,7 +91,7 @@ int encode_list_write(void *data, const char *buf, size_t len)
li->li_tv.vval.v_string = xrealloc(li->li_tv.vval.v_string,
li_len + line_length + 1);
str = (char *) li->li_tv.vval.v_string + li_len;
memmove(str, line_start, line_length);
memcpy(str, line_start, line_length);
str[line_length] = 0;
}
for (size_t i = 0; i < line_length; i++) {
@@ -101,14 +99,14 @@ int encode_list_write(void *data, const char *buf, size_t len)
str[i] = NL;
}
}
if (li == NULL) {
list_append_allocated_string(list, str);
} else {
li = NULL;
}
if (line_end == end - 1) {
list_append_allocated_string(list, NULL);
}
}
if (li == NULL) {
list_append_allocated_string(list, str);
} else {
li = NULL;
}
if (line_end == end - 1) {
list_append_allocated_string(list, NULL);
}
line_end++;
} while (line_end < end);