summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2015-11-22 16:25:06 +0000
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2015-11-22 16:25:06 +0000
commitb0323cab3b845f1cfa3bc4bc029de86b207ec26e (patch)
treeae7bb9ee104b0d8e205878789abda7f4fe682213
parentae4cf7b743da0785cb8d1f0d01b8697318f254dc (diff)
downloadzsh-b0323cab3b845f1cfa3bc4bc029de86b207ec26e.tar.gz
zsh-b0323cab3b845f1cfa3bc4bc029de86b207ec26e.tar.xz
zsh-b0323cab3b845f1cfa3bc4bc029de86b207ec26e.zip
37187: infinite loop in "hash -m"
-rw-r--r--ChangeLog2
-rw-r--r--Src/builtin.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ce46dccf0..9cc4cf93c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-11-22  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 3787: Src/builtin.c: infinite loop in "hash -m".
+
 	* 37186: Functions/VCS_Info/VCS_INFO_nvcsformats,
 	Src/Zle/zle_main.c: a couple of WARN_CREATE_GLOBAL fixes.
 
diff --git a/Src/builtin.c b/Src/builtin.c
index 01eb5b84c..cac4f42f9 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -3712,6 +3712,7 @@ bin_hash(char *name, char **argv, Options ops, UNUSED(int func))
 		zwarnnam(name, "bad pattern : %s", *argv);
 		returnval = 1;
 	    }
+	    argv++;
             continue;
 	}
         if (!(asg = getasg(&argv, NULL))) {