diff options
| author |   millert <millert@openbsd.org> | 2018-01-07 19:18:56 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2018-01-07 19:18:56 +0000 |
| commit | 8234bcc53c54c1baf82cb300118332958f446438 (patch) | |
| tree | 558486769ecbc58536afc05f127ceb7172443d88 | |
| parent | amd64_{get,set}_fsbase() are superfluous and unused; delete them. (diff) | |
| download | wireguard-openbsd-8234bcc53c54c1baf82cb300118332958f446438.tar.xz wireguard-openbsd-8234bcc53c54c1baf82cb300118332958f446438.zip | |
Add proper bounds checking to kb_add(). OK anton@
| -rw-r--r-- | bin/ksh/emacs.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/bin/ksh/emacs.c b/bin/ksh/emacs.c index f7d2d59ae5c..b95964c23f2 100644 --- a/bin/ksh/emacs.c +++ b/bin/ksh/emacs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emacs.c,v 1.80 2018/01/06 16:28:58 millert Exp $ */ +/* $OpenBSD: emacs.c,v 1.81 2018/01/07 19:18:56 millert Exp $ */ /* * Emacs-like command line editing and history @@ -1328,20 +1328,21 @@ static struct kb_entry * kb_add(void *func, void *args, ...) { va_list ap; - unsigned int i, count = 0; - char l[LINE + 1]; - - va_start(ap, args); - while (va_arg(ap, unsigned int) != 0) - count++; - va_end(ap); + unsigned char ch; + unsigned int i; + char line[LINE + 1]; va_start(ap, args); - for (i = 0; i <= count /* <= is correct */; i++) - l[i] = (unsigned char)va_arg(ap, unsigned int); + for (i = 0; i < sizeof(line) - 1; i++) { + ch = va_arg(ap, unsigned int); + if (ch == 0) + break; + line[i] = ch; + } va_end(ap); + line[i] = '\0'; - return (kb_add_string(func, args, l)); + return (kb_add_string(func, args, line)); } static void |