IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.825

Browse Source 
Problem:    Invalid memory access for ":syn keyword x a[".
Solution:   Do not skip over the NUL. (Dominique Pelle)

1560d07045
This commit is contained in:
Jurica Bradaric 2016-02-02 20:30:30 +01:00
parent 8d5cfe4ffc
commit 52692d3cd3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/syntax.c
View File

@ -4183,12 +4183,14 @@ static void syn_cmd_keyword(exarg_T *eap, int syncing)
break; break;
if (p[1] == NUL) { if (p[1] == NUL) {
EMSG2(_("E789: Missing ']': %s"), kw); EMSG2(_("E789: Missing ']': %s"), kw);
kw = p + 2; /* skip over the NUL */ goto error;
break;
} }
if (p[1] == ']') { if (p[1] == ']') {
kw = p + 1; /* skip over the "]" */ if (p[2] != NUL) {
break; EMSG3(_("E890: trailing char after ']': %s]%s"),
kw, &p[2]);
goto error;
}
} }
if (has_mbyte) { if (has_mbyte) {
int l = (*mb_ptr2len)(p + 1); int l = (*mb_ptr2len)(p + 1);
@ -4203,6 +4205,7 @@ static void syn_cmd_keyword(exarg_T *eap, int syncing)
} }
} }
error:
xfree(keyword_copy); xfree(keyword_copy);
xfree(syn_opt_arg.cont_in_list); xfree(syn_opt_arg.cont_in_list);
xfree(syn_opt_arg.next_list); xfree(syn_opt_arg.next_list);

2
src/nvim/version.c
View File

@ -463,7 +463,7 @@ static int included_patches[] = {
// 828, // 828,
// 827, // 827,
826, 826,
// 825, 825,
// 824 NA // 824 NA
823, 823,
// 822, // 822,