diff --git a/src/filepath.c b/src/filepath.c
index 01d2dcb..ef5edae 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -1658,7 +1658,8 @@
 	int	limit = 100;
 
 	p = vim_strsave(p);
-
+	if (p == NULL)
+	    goto fail;
 	if (p[0] == '.' && (vim_ispathsep(p[1])
 				   || (p[1] == '.' && (vim_ispathsep(p[2])))))
 	    is_relative_to_current = TRUE;
@@ -1681,7 +1682,10 @@
 
 	buf = alloc(MAXPATHL + 1);
 	if (buf == NULL)
+	{
+	    vim_free(p);
 	    goto fail;
+	}
 
 	for (;;)
 	{