From bef4790c236327ebb77cd438d49ac9b8e7dc6542 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 6 Jul 2012 16:49:40 +0200 Subject: [PATCH] updated for version 7.3.589 Problem: Crash when $HOME is not set. Solution: Check for a NULL pointer. (Chris Webb) --- src/misc1.c | 8 +++++--- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/misc1.c b/src/misc1.c index 99881dccd..348227206 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -4496,8 +4496,12 @@ home_replace(buf, src, dst, dstlen, one) #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 (vim_strchr(homedir_env, '~') != NULL) + if (homedir_env != NULL && vim_strchr(homedir_env, '~') != NULL) { int usedlen = 0; int flen; @@ -4513,8 +4517,6 @@ home_replace(buf, src, dst, dstlen, one) } #endif - if (homedir_env != NULL && *homedir_env == NUL) - homedir_env = NULL; if (homedir_env != NULL) envlen = STRLEN(homedir_env); diff --git a/src/version.c b/src/version.c index 2676fa7fc..0acbce0ab 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 589, /**/ 588, /**/