From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 14 Oct 2012 02:35:45 +0000 (+0200)
Subject: updated for version 7.3.690
X-Git-Tag: v7.3.690
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dac7569612d4088084ef81dfc32c3bb86aec090f;p=thirdparty%2Fvim.git

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 2ef5893502..ae41579dc5 100644
--- 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 0ea098b92e..01d6793018 100644
--- 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,
 /**/