From 813690bb68a59a72b6a9dfb0d7dab8aa21ebd114 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 4 Mar 2015 20:23:31 -0500
Subject: fix: segfault in recover_names(): must not concat full path

- regression by 42f1bd9b2228aaca4fb8a5597a3b5774f7ef6876
- closes #1836
---
 src/nvim/memline.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index f7248e8c42..b3b53b768f 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -1341,9 +1341,10 @@ recover_names (
         if (after_pathsep(dir_name, p) && p[-1] == p[-2]) {
           /* Ends with '//', Use Full path for swap name */
           tail = make_percent_swname(dir_name, fname_res);
-        } else
-        tail = path_tail(fname_res);
-        tail = concat_fnames(dir_name, tail, TRUE);
+        } else {
+          tail = path_tail(fname_res);
+          tail = concat_fnames(dir_name, tail, TRUE);
+        }
         num_names = recov_file_names(names, tail, FALSE);
         free(tail);
       }
-- 
cgit