1 files changed, 10 insertions, 2 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 75a26d88c1..1c787e3a1d 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -852,8 +852,13 @@ static char_u *get_path_cutoff(char_u *fname, garray_T *gap)
     int j = 0;
 
     while ((fname[j] == path_part[i][j]
-            ) && fname[j] != NUL && path_part[i][j] != NUL)
+#ifdef WIN32
+            || (vim_ispathsep(fname[j]) && vim_ispathsep(path_part[i][j]))
+#endif
+            )  // NOLINT(whitespace/parens)
+           && fname[j] != NUL && path_part[i][j] != NUL) {
       j++;
+    }
     if (j > maxlen) {
       maxlen = j;
       cutoff = &fname[j];
@@ -1257,7 +1262,10 @@ int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file,
       } else {
         addfile(&ga, t, flags);
       }
-      xfree(t);
+
+      if (t != p) {
+        xfree(t);
+      }
     }
 
     if (did_expand_in_path && !GA_EMPTY(&ga) && (flags & EW_PATH))