about summary refs log tree commit diff
path: root/Src/loop.c
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-04-20 10:27:15 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-04-20 10:27:15 -0700
commit848badaa5f0a18ca3388016d49ffc340b6c2d0c6 (patch)
tree6588e5f278aeb789405651e5d3c2f0c7409bf778 /Src/loop.c
parent8189e12312ede991827efc6683b7ce8463deb0bf (diff)
downloadzsh-848badaa5f0a18ca3388016d49ffc340b6c2d0c6.tar.gz
zsh-848badaa5f0a18ca3388016d49ffc340b6c2d0c6.tar.xz
zsh-848badaa5f0a18ca3388016d49ffc340b6c2d0c6.zip
32568: consistency in handling of errflag condition during substitutions
Affects for/select word lists, function definition name position, and
anonymous function argument lists.
Diffstat (limited to 'Src/loop.c')
-rw-r--r--Src/loop.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/Src/loop.c b/Src/loop.c
index 90a0761b3..dc8f2320f 100644
--- a/Src/loop.c
+++ b/Src/loop.c
@@ -87,8 +87,13 @@ execfor(Estate state, int do_exec)
 		state->pc = end;
 		return 0;
 	    }
-	    if (htok)
+	    if (htok) {
 		execsubst(args);
+		if (errflag) {
+		    state->pc = end;
+		    return 1;
+		}
+	    }
 	} else {
 	    char **x;
 
@@ -223,8 +228,13 @@ execselect(Estate state, UNUSED(int do_exec))
 	    state->pc = end;
 	    return 0;
 	}
-	if (htok)
+	if (htok) {
 	    execsubst(args);
+	    if (errflag) {
+		state->pc = end;
+		return 1;
+	    }
+	}
     }
     if (!args || empty(args)) {
 	state->pc = end;