diff options
| -rw-r--r-- | src/nvim/eval.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f50a215559..feb600104f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -19665,6 +19665,7 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags) regmatch_T regmatch; int do_all; char_u *tail; + char_u *end; garray_T ga; char_u *save_cpo; char_u *zero_width = NULL; @@ -19681,6 +19682,7 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags) regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING); if (regmatch.regprog != NULL) { tail = str; + end = str + STRLEN(str); while (vim_regexec_nl(®match, str, (colnr_T)(tail - str))) { /* Skip empty match except for first match. */ if (regmatch.startp[0] == regmatch.endp[0]) { @@ -19703,7 +19705,7 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags) * - The text after the match. */ sublen = vim_regsub(®match, sub, tail, FALSE, TRUE, FALSE); - ga_grow(&ga, (int)(STRLEN(tail) + sublen - + ga_grow(&ga, (int)((end - tail) + sublen - (regmatch.endp[0] - regmatch.startp[0]))); /* copy the text up to where the match is */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 2b099fba11..0c2d831433 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -239,7 +239,7 @@ static int included_patches[] = { //502, //501 NA //500, - //499, + 499, //498 NA //497, //496 NA |