From fdaf71f0ae7958dfeeb8e35ea1aad4389cc08582 Mon Sep 17 00:00:00 2001
From: jilles <jilles@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 21 Jan 2012 21:54:31 +0000
Subject: [PATCH] MFC r230117: sh: Fix out of bounds array access when trap is
 used with an invalid signal.

git-svn-id: svn://svn.freebsd.org/base/stable/9@230439 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 bin/sh/trap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 2b6d8a585..a6f929df6 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -191,10 +191,11 @@ trapcmd(int argc, char **argv)
 			argv++;
 		}
 	}
-	while (*argv) {
+	for (; *argv; argv++) {
 		if ((signo = sigstring_to_signum(*argv)) == -1) {
 			warning("bad signal %s", *argv);
 			errors = 1;
+			continue;
 		}
 		INTOFF;
 		if (action)
@@ -205,7 +206,6 @@ trapcmd(int argc, char **argv)
 		if (signo != 0)
 			setsignal(signo);
 		INTON;
-		argv++;
 	}
 	return errors;
 }
-- 
2.45.0