aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.913

Browse Source 
Problem:    Still a crash when writing viminfo.
Solution:   Add checks for NULL pointers. (Ron Aaron)
This commit is contained in:
Bram Moolenaar 2013-04-24 15:39:11 +02:00
parent ec38d6932c
commit f687cf3f36
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ex_getln.c
View File

@ -6177,6 +6177,7 @@ finish_viminfo_history()
} }
vim_free(viminfo_history[type]); vim_free(viminfo_history[type]);
viminfo_history[type] = NULL; viminfo_history[type] = NULL;
viminfo_hisidx[type] = 0;
} }
} }
@ -6230,6 +6231,7 @@ write_viminfo_history(fp)
&& !(round == 2 && i >= viminfo_hisidx[type])) && !(round == 2 && i >= viminfo_hisidx[type]))
{ {
p = round == 1 ? history[type][i].hisstr p = round == 1 ? history[type][i].hisstr
: viminfo_history[type] == NULL ? NULL
: viminfo_history[type][i]; : viminfo_history[type][i];
if (p != NULL && (round == 2 || !history[type][i].viminfo)) if (p != NULL && (round == 2 || !history[type][i].viminfo))
{ {
@ -6261,7 +6263,8 @@ write_viminfo_history(fp)
} }
} }
for (i = 0; i < viminfo_hisidx[type]; ++i) for (i = 0; i < viminfo_hisidx[type]; ++i)
vim_free(viminfo_history[type][i]); if (viminfo_history[type] != NULL)
vim_free(viminfo_history[type][i]);
vim_free(viminfo_history[type]); vim_free(viminfo_history[type]);
viminfo_history[type] = NULL; viminfo_history[type] = NULL;
viminfo_hisidx[type] = 0; viminfo_hisidx[type] = 0;

2
src/version.c
View File

@ -728,6 +728,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 */
/**/
913,
/**/ /**/
912, 912,
/**/ /**/