]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.360.patch0
Merge remote-tracking branch 'stevee/dracut'
[ipfire-3.x.git] / vim / patches / vim-7.3.360.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.360
3 Fcc: outbox
4 From: Bram Moolenaar <Bram@moolenaar.net>
5 Mime-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8 ------------
9
10 Patch 7.3.360
11 Problem: Interrupting the load of an autoload function may cause a crash.
12 Solution: Do not use the hashitem when not valid. (Yukihiro Nakadaira)
13 Files: src/eval.c
14
15
16 *** ../vim-7.3.359/src/eval.c 2011-11-30 14:57:26.000000000 +0100
17 --- src/eval.c 2011-11-30 15:06:53.000000000 +0100
18 ***************
19 *** 19589,19597 ****
20 * worked find the variable again. Don't auto-load a script if it was
21 * loaded already, otherwise it would be loaded every time when
22 * checking if a function name is a Funcref variable. */
23 ! if (ht == &globvarht && !writing
24 ! && script_autoload(varname, FALSE) && !aborting())
25 hi = hash_find(ht, varname);
26 if (HASHITEM_EMPTY(hi))
27 return NULL;
28 }
29 --- 19589,19602 ----
30 * worked find the variable again. Don't auto-load a script if it was
31 * loaded already, otherwise it would be loaded every time when
32 * checking if a function name is a Funcref variable. */
33 ! if (ht == &globvarht && !writing)
34 ! {
35 ! /* Note: script_autoload() may make "hi" invalid. It must either
36 ! * be obtained again or not used. */
37 ! if (!script_autoload(varname, FALSE) || aborting())
38 ! return NULL;
39 hi = hash_find(ht, varname);
40 + }
41 if (HASHITEM_EMPTY(hi))
42 return NULL;
43 }
44 *** ../vim-7.3.359/src/version.c 2011-11-30 14:57:26.000000000 +0100
45 --- src/version.c 2011-11-30 15:17:28.000000000 +0100
46 ***************
47 *** 716,717 ****
48 --- 716,719 ----
49 { /* Add new patch number below this line */
50 + /**/
51 + 360,
52 /**/
53
54 --
55 hundred-and-one symptoms of being an internet addict:
56 217. Your sex life has drastically improved...so what if it's only cyber-sex!
57
58 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
59 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
60 \\\ an exciting new programming language -- http://www.Zimbu.org ///
61 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///