1 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index b4f1aba0c5..eee3b9d517 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -1377,17 +1377,19 @@ char *make_percent_swname(const char *dir, const char *name)
 {
   char *d = NULL;
   char *f = fix_fname(name != NULL ? name : "");
-  if (f != NULL) {
-    char *s = xstrdup(f);
-    for (d = s; *d != NUL; MB_PTR_ADV(d)) {
-      if (vim_ispathsep(*d)) {
-        *d = '%';
-      }
+  if (f == NULL) {
+    return NULL;
+  }
+
+  char *s = xstrdup(f);
+  for (d = s; *d != NUL; MB_PTR_ADV(d)) {
+    if (vim_ispathsep(*d)) {
+      *d = '%';
     }
-    d = concat_fnames(dir, s, true);
-    xfree(s);
-    xfree(f);
   }
+  d = concat_fnames(dir, s, true);
+  xfree(s);
+  xfree(f);
   return d;
 }