From 07e8db1da55381fe5ace0aa8f29c0cbaf2020fc2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 25 May 2010 21:37:17 +0200 Subject: [PATCH] updated for version 7.2.438 Problem: "vim -r" crashes. Solution: Don't use NULL pointer argument. --- src/memline.c | 9 ++++++++- src/version.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/memline.c b/src/memline.c index 74f94ed416..84ce2d585c 100644 --- 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 7a0642a226..31a49be372 100644 --- 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, /**/ -- 2.47.3