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

updated for version 7.3.360

Browse Source 
Problem:    Interrupting the load of an autoload function may cause a crash.
Solution:   Do not use the hashitem when not valid. (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar
2011-11-30 15:19:28 +01:00
parent 195ea0ff6c
commit 8000baffa7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/eval.c
View File

@@ -19589,9 +19589,14 @@ find_var_in_ht(ht, varname, writing)
* worked find the variable again. Don't auto-load a script if it was * worked find the variable again. Don't auto-load a script if it was
* loaded already, otherwise it would be loaded every time when * loaded already, otherwise it would be loaded every time when
* checking if a function name is a Funcref variable. */ * checking if a function name is a Funcref variable. */
if (ht == &globvarht && !writing if (ht == &globvarht && !writing)
&& script_autoload(varname, FALSE) && !aborting()) {
/* Note: script_autoload() may make "hi" invalid. It must either
* be obtained again or not used. */
if (!script_autoload(varname, FALSE) || aborting())
return NULL;
hi = hash_find(ht, varname); hi = hash_find(ht, varname);
}
if (HASHITEM_EMPTY(hi)) if (HASHITEM_EMPTY(hi))
return NULL; return NULL;
} }

2
src/version.c
View File

@@ -714,6 +714,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 */
/**/
360,
/**/ /**/
359, 359,
/**/ /**/