2 files changed, 26 insertions, 8 deletions
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index 19d785bb8..92bb2c803 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -731,19 +731,17 @@ do_ambiguous(void)
 mod_export int
 ztat(char *nam, struct stat *buf, int ls)
 {
-    char b[PATH_MAX], *p;
+    int e;
+    char *b;
 
     if (!(ls ? lstat(nam, buf) : stat(nam, buf)))
 	return 0;
 
-    for (p = b; p < b + sizeof(b) - 1 && *nam; nam++)
-	if (*nam == '\\' && nam[1])
-	    *p++ = *++nam;
-	else
-	    *p++ = *nam;
-    *p = '\0';
+    b = ztrdupstrip(nam, '\\');
 
-    return ls ? lstat(b, buf) : stat(b, buf);
+    e = ls ? lstat(b, buf) : stat(b, buf);
+    zsfree(b);
+    return e;
 }
 
 /* Insert a single match in the command line. */
diff --git a/Src/string.c b/Src/string.c
index 3dad89911..57775359e 100644
--- a/Src/string.c
+++ b/Src/string.c
@@ -133,3 +133,23 @@ appstr(char *base, char const *append)
 {
     return strcat(realloc(base, strlen(base) + strlen(append) + 1), append);
 }
+
+/* Duplicate a string, stripping delimiters. */
+
+/**/
+mod_export char *
+ztrdupstrip(const char *nam, char delim)
+{
+    char *p, *buf;
+
+    buf = zalloc(strlen(nam));
+
+    for (p = buf; *nam; nam++)
+        if (*nam == delim && nam[1])
+            *p++ = *++nam;
+        else
+            *p++ = *nam;
+    *p = '\0';
+
+    return buf;
+}