1
0
forked from aniani/vim

updated for version 7.3.913

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

View File

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

View File

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