updated for version 7.3.051

Problem:    Crash when /home/mool/bin:/usr/local/sbin:/usr/local/bin:/home/mool/java/jdk/bin:/bin:/sbin:/usr/bin:/usr/games:/usr/sbin:/usr/X11R6/bin:/usr/local/linux-jdk1.3.1/bin:/usr/local/lib/python2.2/Tools/idle is empty.
Solution:   Check for vim_getenv() returning NULL. (Yasuhiro Matsumoto)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index c3514874f73baef1d3b0a9827b76fb654df13080..c0d2496b8c222265f4b84037fc27d4e472fcf528 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4747,7 +4747,11 @@ expand_shellcmd(filepat, num_file, file, flagsarg)
                            || (pat[1] == '.' && vim_ispathsep(pat[2])))))
        path = (char_u *)".";
     else
+    {
        path = vim_getenv((char_u *)"PATH", &mustfree);
+       if (path == NULL)
+           path = (char_u *)"";
+    }
 
     /*
      * Go over all directories in $PATH.  Expand matches in that directory and

diff --git a/src/os_win32.c b/src/os_win32.c
index 0ca47d0feade66074345ea30c3b3cf4776e3b4d7..423ea8903732ac7249f865434f41d9c88be6d5e2 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -211,13 +211,16 @@ static char_u *exe_path = NULL;
     static void
 get_exe_name(void)
 {
-    char       temp[MAXPATHL];
+    /* Maximum length of $PATH is more than MAXPATHL.  8191 is often mentioned
+     * as the maximum length that works (plus a NUL byte). */
+#define MAX_ENV_PATH_LEN 8192
+    char       temp[MAX_ENV_PATH_LEN];
     char_u     *p;
 
     if (exe_name == NULL)
     {
        /* store the name of the executable, may be used for $VIM */
-       GetModuleFileName(NULL, temp, MAXPATHL - 1);
+       GetModuleFileName(NULL, temp, MAX_ENV_PATH_LEN - 1);
        if (*temp != NUL)
            exe_name = FullName_save((char_u *)temp, FALSE);
     }
@@ -232,10 +235,16 @@ get_exe_name(void)
             * "!xxd" it's found in our starting directory.  Needed because
             * SearchPath() also looks there. */
            p = mch_getenv("PATH");
-           if (STRLEN(p) + STRLEN(exe_path) + 2 < MAXPATHL)
+           if (p == NULL
+                      || STRLEN(p) + STRLEN(exe_path) + 2 < MAX_ENV_PATH_LEN)
            {
-               STRCPY(temp, p);
-               STRCAT(temp, ";");
+               if (p == NULL || *p == NUL)
+                   temp[0] = NUL;
+               else
+               {
+                   STRCPY(temp, p);
+                   STRCAT(temp, ";");
+               }
                STRCAT(temp, exe_path);
                vim_setenv((char_u *)"PATH", temp);
            }

diff --git a/src/version.c b/src/version.c
index 8756e19bbd587674b968c7c0a6e0c4991c958ab6..24992e771831a881527010b9fd43f87cd1de69b8 100644 (file)
--- 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 */
+/**/
+    51,
 /**/
     50,
 /**/