diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-11-30 15:19:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-11-30 15:19:28 +0100 |
| commit | 8000baffa7bc80773d4a80769837e73e5c5715b5 (patch) | |
| tree | 4b3ab48385ac53929ce94a7e935d63a40b5c7d7a /src | |
| parent | 195ea0ff6cbb15e5e18dcade13b612ddd7e9d68e (diff) | |
| download | vim-8000baffa7bc80773d4a80769837e73e5c5715b5.zip | |
updated for version 7.3.360
Problem: Interrupting the load of an autoload function may cause a crash.
Solution: Do not use the hashitem when not valid. (Yukihiro Nakadaira)
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 847495639..d93836a89 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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 * loaded already, otherwise it would be loaded every time when * checking if a function name is a Funcref variable. */ - if (ht == &globvarht && !writing - && script_autoload(varname, FALSE) && !aborting()) + if (ht == &globvarht && !writing) + { + /* 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); + } if (HASHITEM_EMPTY(hi)) return NULL; } diff --git a/src/version.c b/src/version.c index b186a7368..1eadaec24 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 360, +/**/ 359, /**/ 358, |