svn commit: r230117 - head/bin/sh

[Jilles Tjoelker]

Author: jilles
Date: Sat Jan 14 21:54:12 2012
New Revision: 230117
URL: http://svn.freebsd.org/changeset/base/230117

Log:
  sh: Fix out of bounds array access when trap is used with an invalid signal.
  
  MFC after:	1 week

Modified:
  head/bin/sh/trap.c

Modified: head/bin/sh/trap.c
==============================================================================
--- head/bin/sh/trap.c	Sat Jan 14 21:51:44 2012	(r230116)
+++ head/bin/sh/trap.c	Sat Jan 14 21:54:12 2012	(r230117)
@@ -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;
 }