diff options
| author |   millert <millert@openbsd.org> | 2017-12-05 17:47:09 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2017-12-05 17:47:09 +0000 |
| commit | bea177d65497ea7128318c79a3f032f529e56683 (patch) | |
| tree | a558f68c8ad5864f7ad192702e273f6acc5dfaeb | |
| parent | Show board ID and revision in dmesg to ease the identification (diff) | |
| download | wireguard-openbsd-bea177d65497ea7128318c79a3f032f529e56683.tar.xz wireguard-openbsd-bea177d65497ea7128318c79a3f032f529e56683.zip | |
Fix a case where we could go off the end of the buffer.
Crash found by Sergey Bronnikov using afl-fuzz.
Based on a diff from and OK by espie@
| -rw-r--r-- | usr.bin/make/for.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c index 64887d5e769..e285d2a6a29 100644 --- a/usr.bin/make/for.c +++ b/usr.bin/make/for.c @@ -1,4 +1,4 @@ -/* $OpenBSD: for.c,v 1.46 2015/01/23 13:18:40 espie Exp $ */ +/* $OpenBSD: for.c,v 1.47 2017/12/05 17:47:09 millert Exp $ */ /* $NetBSD: for.c,v 1.4 1996/11/06 17:59:05 christos Exp $ */ /* @@ -155,9 +155,12 @@ For_Eval(const char *line) Parse_Error(PARSE_FATAL, "Syntax error in for"); return 0; } - endVar = ptr++; - while (ISSPACE(*ptr)) + endVar = ptr; + if (*ptr) { ptr++; + while (ISSPACE(*ptr)) + ptr++; + } /* End of variable list ? */ if (endVar - wrd == 2 && wrd[0] == 'i' && wrd[1] == 'n') break; |