diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-19 15:19:21 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-19 15:19:21 +0000 |
| commit | f160ec337f603c0e7ea75c3b042ba5db86a28394 (patch) | |
| tree | cd96ac9041a106c937d38d2bb0c5483b4b6ee82b | |
| parent | fbfc7e81f0827db3ca4fd3d62d724455f1324ebe (diff) | |
one small tweak to avoid ever going off the end of a string.
| -rw-r--r-- | lib/libc/crypt/bcrypt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c index a077c99de57..7fcb2a51874 100644 --- a/lib/libc/crypt/bcrypt.c +++ b/lib/libc/crypt/bcrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcrypt.c,v 1.38 2014/04/19 15:17:59 tedu Exp $ */ +/* $OpenBSD: bcrypt.c,v 1.39 2014/04/19 15:19:20 tedu Exp $ */ /* * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> @@ -276,10 +276,12 @@ decode_base64(u_int8_t *buffer, size_t len, const char *b64data) while (bp < buffer + len) { c1 = CHAR64(*p); - c2 = CHAR64(*(p + 1)); - /* Invalid data */ - if (c1 == 255 || c2 == 255) + if (c1 == 255) + return -1; + + c2 = CHAR64(*(p + 1)); + if (c2 == 255) return -1; *bp++ = (c1 << 2) | ((c2 & 0x30) >> 4); |