summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/parse.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d980558d8..6555883e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-17  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 34921: Src/parse.c: handle error in recursive par_event().
+
 2015-04-17  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 34920: Etc/zsh-development-guide: info on git pull.
diff --git a/Src/parse.c b/Src/parse.c
index 91a81e1ff..985eb8e71 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -605,6 +605,7 @@ par_event(int endtok)
 	if (!par_event(endtok)) {
 	    ecused = oec;
 	    ecbuf[p] |= wc_bdata(Z_END);
+	    return errflag ? 0 : 1;
 	}
     }
     return 1;