aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.1502: in out-of-memory situation character is not restored

Browse Source 
Problem:    In out-of-memory situation character is not restored. (Coverity)
Solution:   Restore the character in all situations.
This commit is contained in:
Bram Moolenaar
2018-02-11 15:20:20 +01:00
parent a0221df149
commit 71a43c0137
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ex_getln.c
View File

@@ -5315,8 +5315,9 @@ ExpandUserDefined(
char_u *retstr; char_u *retstr;
char_u *s; char_u *s;
char_u *e; char_u *e;
char_u keep; int keep;
garray_T ga; garray_T ga;
int skip;
retstr = call_user_expand_func(call_func_retstr, xp, num_file, file); retstr = call_user_expand_func(call_func_retstr, xp, num_file, file);
if (retstr == NULL) if (retstr == NULL)
@@ -5329,23 +5330,19 @@ ExpandUserDefined(
if (e == NULL) if (e == NULL)
e = s + STRLEN(s); e = s + STRLEN(s);
keep = *e; keep = *e;
*e = 0; *e = NUL;
if (xp->xp_pattern[0] && vim_regexec(regmatch, s, (colnr_T)0) == 0) skip = xp->xp_pattern[0] && vim_regexec(regmatch, s, (colnr_T)0) == 0;
*e = keep;
if (!skip)
{ {
*e = keep; if (ga_grow(&ga, 1) == FAIL)
if (*e != NUL) break;
++e; ((char_u **)ga.ga_data)[ga.ga_len] = vim_strnsave(s, (int)(e - s));
continue; ++ga.ga_len;
} }
if (ga_grow(&ga, 1) == FAIL)
break;
((char_u **)ga.ga_data)[ga.ga_len] = vim_strnsave(s, (int)(e - s));
++ga.ga_len;
*e = keep;
if (*e != NUL) if (*e != NUL)
++e; ++e;
} }

2
src/version.c
View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1502,
/**/ /**/
1501, 1501,
/**/ /**/