updated for version 7.2.438

Problem:    "vim -r" crashes.
Solution:   Don't use NULL pointer argument.

diff --git a/src/memline.c b/src/memline.c
index 74f94ed416545474f7619e53d6edab18cd746dd8..84ce2d585c1c8b40a61d758db22ef1f32e7b681c 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -1404,15 +1404,22 @@ recover_names(fname, list, nr)
     int                i;
     char_u     *dirp;
     char_u     *dir_name;
-    char_u     *fname_res = *fname;
+    char_u     *fname_res = NULL;
 #ifdef HAVE_READLINK
     char_u     fname_buf[MAXPATHL];
+#endif
 
+    if (fname != NULL)
+    {
+#ifdef HAVE_READLINK
     /* Expand symlink in the file name, because the swap file is created with
      * the actual file instead of with the symlink. */
     if (resolve_symlink(*fname, fname_buf) == OK)
        fname_res = fname_buf;
+    else
 #endif
+       fname_res = *fname;
+    }
 
     if (list)
     {

diff --git a/src/version.c b/src/version.c
index 7a0642a2261addfecc6a8885cd2de71f829ef501..31a49be372ad1d2b414f4e2df9e0dcf31dde8b28 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    438,
 /**/
     437,
 /**/