blob: fdda2b95f750ce8764ba20d6de6c1408d6d0b8fa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
To: vim_dev@googlegroups.com
Subject: Patch 7.3.589
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.589
Problem: Crash when $HOME is not set.
Solution: Check for a NULL pointer. (Chris Webb)
Files: src/misc1.c
*** ../vim-7.3.588/src/misc1.c 2012-06-29 15:04:34.000000000 +0200
--- src/misc1.c 2012-07-06 16:44:39.000000000 +0200
***************
*** 4496,4503 ****
#else
homedir_env_orig = homedir_env = mch_getenv((char_u *)"HOME");
#endif
#if defined(FEAT_MODIFY_FNAME) || defined(WIN3264)
! if (vim_strchr(homedir_env, '~') != NULL)
{
int usedlen = 0;
int flen;
--- 4496,4507 ----
#else
homedir_env_orig = homedir_env = mch_getenv((char_u *)"HOME");
#endif
+ /* Empty is the same as not set. */
+ if (homedir_env != NULL && *homedir_env == NUL)
+ homedir_env = NULL;
+
#if defined(FEAT_MODIFY_FNAME) || defined(WIN3264)
! if (homedir_env != NULL && vim_strchr(homedir_env, '~') != NULL)
{
int usedlen = 0;
int flen;
***************
*** 4513,4520 ****
}
#endif
- if (homedir_env != NULL && *homedir_env == NUL)
- homedir_env = NULL;
if (homedir_env != NULL)
envlen = STRLEN(homedir_env);
--- 4517,4522 ----
*** ../vim-7.3.588/src/version.c 2012-07-06 16:39:43.000000000 +0200
--- src/version.c 2012-07-06 16:45:18.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 589,
/**/
--
I AM THANKFUL...
...for the taxes that I pay because it means that I am employed.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
