From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 25 May 2010 19:37:17 +0000 (+0200)
Subject: updated for version 7.2.438
X-Git-Tag: v7.3~351
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64354da438bc99a366a14f391f85c23af2907eb9;p=vim

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 c3fdba313..b38a46de7 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1439,15 +1439,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)
     {