thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0325: strings in swap file may not be NUL terminated

Browse Source 
Problem:    Strings in swap file may not be NUL terminated. (Coverity)
Solution:   Limit the length of the used string.
This commit is contained in:
Bram Moolenaar
2018-08-23 23:01:27 +02:00
parent 74c8be2c68
commit 7c60505e10
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/memline.c
View File

@@ -2065,10 +2065,13 @@ get_b0_dict(char_u *fname, dict_T *d)
else else
{ {
/* we have swap information */ /* we have swap information */
dict_add_string(d, "version", vim_strsave(b0.b0_version)); dict_add_string(d, "version", vim_strnsave(b0.b0_version, 10));
dict_add_string(d, "user", vim_strsave(b0.b0_uname)); dict_add_string(d, "user",
dict_add_string(d, "host", vim_strsave(b0.b0_hname)); vim_strnsave(b0.b0_uname, B0_UNAME_SIZE));
dict_add_string(d, "fname", vim_strsave(b0.b0_fname)); dict_add_string(d, "host",
vim_strnsave(b0.b0_hname, B0_HNAME_SIZE));
dict_add_string(d, "fname",
vim_strnsave(b0.b0_fname, B0_FNAME_SIZE_ORG));
dict_add_number(d, "pid", char_to_long(b0.b0_pid)); dict_add_number(d, "pid", char_to_long(b0.b0_pid));
dict_add_number(d, "mtime", char_to_long(b0.b0_mtime)); dict_add_number(d, "mtime", char_to_long(b0.b0_mtime));

2
src/version.c
View File

@@ -794,6 +794,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 */
/**/
325,
/**/ /**/
324, 324,
/**/ /**/