aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1918

Browse Source 
Problem:    Not enough testing for parsing viminfo lines.
Solution:   Add test with viminfo lines in bad syntax.  Fix memory leak.
This commit is contained in:
Bram Moolenaar
2016-06-11 15:31:47 +02:00
parent 012270936c
commit 62f8b4e180
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ex_cmds.c
View File

@@ -2589,13 +2589,18 @@ barline_parse(vir_T *virp, char_u *text, bval_T *values)
++p;
len = getdigits(&p);
buf = alloc((int)(len + 1));
if (buf == NULL)
return count;
p = buf;
for (todo = len; todo > 0; todo -= n)
{
if (viminfo_readline(virp) || virp->vir_line[0] != '|'
|| virp->vir_line[1] != '<')
{
/* file was truncated or garbled */
return 0;
vim_free(buf);
return count;
}
/* Get length of text, excluding |< and NL chars. */
n = STRLEN(virp->vir_line);
while (n > 0 && (virp->vir_line[n - 1] == NL
@@ -2623,7 +2628,7 @@ barline_parse(vir_T *virp, char_u *text, bval_T *values)
if (viminfo_readline(virp) || virp->vir_line[0] != '|'
|| virp->vir_line[1] != '<')
/* file was truncated or garbled */
return 0;
return count;
p = virp->vir_line + 2;
}
}