summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/glob.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e71a09f3..4329a42ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-27 Barton E. Schaefer <schaefer@zsh.org>
+
+ * 34634: Src/glob.c: avoid infinite recursion on (/)# extendedglob
+
2015-02-27 Daniel Shahaf <d.s@daniel.shahaf.name>
* 34588: Completion/Unix/Command/_user_admin: Complete
diff --git a/Src/glob.c b/Src/glob.c
index 82f8d626c..33facde2b 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -708,7 +708,8 @@ parsecomplist(char *instr)
}
l1 = (Complist) zhalloc(sizeof *l1);
l1->pat = p1;
- l1->closure = 1 + pdflag;
+ /* special case (/)# to avoid infinite recursion */
+ l1->closure = (*((char *)p1 + p1->startoff)) ? 1 + pdflag : 0;
l1->follow = 0;
l1->next = parsecomplist(instr);
return (l1->pat) ? l1 : NULL;