From bc4c3b9af083093839e1cfdc26eb43091d65a880 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Mon, 21 Mar 2011 21:57:35 +0000
Subject: [PATCH] =?UTF-8?q?=E2=80=A2=20save/restore=20here=20document=20po?=
 =?UTF-8?q?inter=20during=20yyrecursive(),=20fixes=20crash=20=E2=80=A2=20a?=
 =?UTF-8?q?dd=20mirbsd/openbsd=20(omalloc=20rules!)=20specific=20testcase?=
 =?UTF-8?q?=20for=20the=20above=20=E2=80=A2=20$=5F=5Fprogname=20must=20be?=
 =?UTF-8?q?=20used=20quoted,=20fix=20in=20comsub-torture=20testcase=20(my?=
 =?UTF-8?q?=20bad)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 check.t | 20 +++++++++++++++-----
 sh.h    |  4 ++--
 syn.c   |  5 ++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/check.t b/check.t
index bb38acb..ef66a4c 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.430 2011/03/17 22:09:20 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.431 2011/03/21 21:57:32 tg Exp $
 # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@@ -25,7 +25,7 @@
 # http://www.research.att.com/~gsf/public/ifs.sh
 
 expected-stdout:
-	@(#)MIRBSD KSH R39 2011/03/17
+	@(#)MIRBSD KSH R39 2011/03/21
 description:
 	Check version of shell.
 stdin:
@@ -7040,13 +7040,13 @@ stdin:
 		if (( lastf )); then
 			x="inline_${nextf}() {"$fbody$'\n}\n'
 			print -nr -- "$x"
-			print -r -- "${x}typeset -f inline_$nextf" | $__progname
+			print -r -- "${x}typeset -f inline_$nextf" | "$__progname"
 			x="function comsub_$nextf { x=\$("$fbody$'\n); }\n'
 			print -nr -- "$x"
-			print -r -- "${x}typeset -f comsub_$nextf" | $__progname
+			print -r -- "${x}typeset -f comsub_$nextf" | "$__progname"
 			x="function reread_$nextf { x=\$(("$fbody$'\n)|tr u x); }\n'
 			print -nr -- "$x"
-			print -r -- "${x}typeset -f reread_$nextf" | $__progname
+			print -r -- "${x}typeset -f reread_$nextf" | "$__progname"
 		fi
 		lastf=1
 		fbody=
@@ -8384,3 +8384,13 @@ expected-stdout:
 	24 ?lnnix/nix =lnnix/nix: No such file or directory !2
 	25 ?lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself =lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself/lnself: Too many levels of symbolic links !62
 ---
+name: crash-1
+description:
+	Crashed during March 2011, fixed on vernal equinōx ☺
+category: os:mirbsd,os:openbsd
+stdin:
+	export MALLOC_OPTIONS=FGJPRSX
+	"$__progname" -c 'x=$(tr z r <<<baz); echo $x'
+expected-stdout:
+	bar
+---
diff --git a/sh.h b/sh.h
index aa374e6..444da3e 100644
--- a/sh.h
+++ b/sh.h
@@ -154,9 +154,9 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.449 2011/03/17 22:09:23 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.450 2011/03/21 21:57:33 tg Exp $");
 #endif
-#define MKSH_VERSION "R39 2011/03/17"
+#define MKSH_VERSION "R39 2011/03/21"
 
 #ifndef MKSH_INCLUDES_ONLY
 
diff --git a/syn.c b/syn.c
index ca398ce..d099b86 100644
--- a/syn.c
+++ b/syn.c
@@ -22,7 +22,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/syn.c,v 1.57 2011/03/13 16:03:54 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/syn.c,v 1.58 2011/03/21 21:57:35 tg Exp $");
 
 struct nesting_state {
 	int start_token;	/* token than began nesting (eg, FOR) */
@@ -1097,6 +1097,7 @@ yyrecursive(void)
 	char *cp;
 	bool old_reject;
 	int old_symbol;
+	struct ioword **old_herep;
 	extern short comsub_nesting_level;
 
 	/* tell the lexer to accept a closing parenthesis as EOD */
@@ -1106,8 +1107,10 @@ yyrecursive(void)
 	old_reject = reject;
 	old_symbol = symbol;
 	ACCEPT;
+	old_herep = herep;
 	/* we use TPAREN as a helper container here */
 	t = nested(TPAREN, '(', ')');
+	herep = old_herep;
 	reject = old_reject;
 	symbol = old_symbol;