diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-03-04 20:23:31 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-12 01:14:54 -0400 |
| commit | 813690bb68a59a72b6a9dfb0d7dab8aa21ebd114 (patch) | |
| tree | 3a192c306d67ad67f2145216e99e7b15a169f49e | |
| parent | b23e444b37197a6f4abe1b18698f9a8f965896e1 (diff) | |
| download | rneovim-813690bb68a59a72b6a9dfb0d7dab8aa21ebd114.tar.gz rneovim-813690bb68a59a72b6a9dfb0d7dab8aa21ebd114.tar.bz2 rneovim-813690bb68a59a72b6a9dfb0d7dab8aa21ebd114.zip | |
fix: segfault in recover_names(): must not concat full path
- regression by 42f1bd9b2228aaca4fb8a5597a3b5774f7ef6876
- closes #1836
| -rw-r--r-- | src/nvim/memline.c | 7 |
1 files changed, 4 insertions, 3 deletions
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); } |