37473: check for cshnullglob in command position.

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 53274e37e..1bb72c837 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-01  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 37473: Src/exec.c: check for cshnullglob in command position.
+
 2015-12-31  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 37469: Src/parse.c: do NOT allow semicolons in place of line breaks
diff --git a/Src/exec.c b/Src/exec.c
index 18d19b672..352615c83 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -2785,6 +2785,11 @@ execcmd(Estate state, int input, int output, int how, int last1)
 		     * arguments before and no command substitution
 		     * has provided a status.
 		     */
+		    if (badcshglob == 1) {
+			zerr("no match");
+			lastval = 1;
+			return;
+		    }
 		    cmdoutval = use_cmdoutval ? lastval : 0;
 		    if (varspc)
 			addvars(state, varspc, 0);