From 75e1716807730619eddd56dbd59b9b34003e40e3 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 12 Oct 2014 13:12:06 +0000
Subject: [PATCH] sh: Fix break/continue/return in multiline eval.

Example:
  eval $'return\necho bad'
---
 bin/sh/eval.c                  | 2 ++
 bin/sh/tests/builtins/Makefile | 2 ++
 bin/sh/tests/builtins/eval7.0  | 9 +++++++++
 bin/sh/tests/builtins/eval8.7  | 7 +++++++
 4 files changed, 20 insertions(+)
 create mode 100644 bin/sh/tests/builtins/eval7.0
 create mode 100644 bin/sh/tests/builtins/eval8.7

diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index ea2d2641e7e..38e227c7d74 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -168,6 +168,8 @@ evalstring(char *s, int flags)
 			else
 				evaltree(n, flags);
 			any = 1;
+			if (evalskip)
+				break;
 		}
 		popstackmark(&smark);
 		setstackmark(&smark);
diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile
index d5d96b58a48..5f5da4a8907 100644
--- a/bin/sh/tests/builtins/Makefile
+++ b/bin/sh/tests/builtins/Makefile
@@ -72,6 +72,8 @@ FILES+=		eval3.0
 FILES+=		eval4.0
 FILES+=		eval5.0
 FILES+=		eval6.0
+FILES+=		eval7.0
+FILES+=		eval8.7
 FILES+=		exec1.0
 FILES+=		exec2.0
 FILES+=		exit1.0
diff --git a/bin/sh/tests/builtins/eval7.0 b/bin/sh/tests/builtins/eval7.0
new file mode 100644
index 00000000000..a309c917b10
--- /dev/null
+++ b/bin/sh/tests/builtins/eval7.0
@@ -0,0 +1,9 @@
+# $FreeBSD$
+# Assumes that break can break out of a loop outside eval.
+
+while :; do
+	eval "break
+echo bad1"
+	echo bad2
+	exit 3
+done
diff --git a/bin/sh/tests/builtins/eval8.7 b/bin/sh/tests/builtins/eval8.7
new file mode 100644
index 00000000000..af6064c388d
--- /dev/null
+++ b/bin/sh/tests/builtins/eval8.7
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+f() {
+	eval "return 7
+echo bad2"
+}
+f