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