updated for version 7.3.690

Problem:    When the current directory name is exactly the maximum path length
            Vim may crash.
Solution:   Only add "/" when there is room. (Danek Duvall)

diff --git a/src/os_unix.c b/src/os_unix.c
index 2ef589350208a8a546287a62fbc7d9cfe6b787ce..ae41579dc5fc4ba9db2e27bfba2dff8af2c56526 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2512,15 +2512,12 @@ mch_FullName(fname, buf, len, force)
        }
 
        l = STRLEN(buf);
-       if (l >= len)
-           retval = FAIL;
+       if (l >= len - 1)
+           retval = FAIL; /* no space for trailing "/" */
 #ifndef VMS
-       else
-       {
-           if (l > 0 && buf[l - 1] != '/' && *fname != NUL
+       else if (l > 0 && buf[l - 1] != '/' && *fname != NUL
                                                   && STRCMP(fname, ".") != 0)
-               STRCAT(buf, "/");
-       }
+           STRCAT(buf, "/");
 #endif
     }
 

diff --git a/src/version.c b/src/version.c
index 0ea098b92efe462710d9570ffeea895b0e4ac002..01d67930180d964e9cf2f3feea4ad04300acaea3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    690,
 /**/
     689,
 /**/