aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2016-04-26 14:31:48 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2016-04-26 14:31:48 +0000
commit8123f597e99ded2f57a419a20af664353b1271f1 (patch)
tree43dd0fc9a12ba8659982ef4975b06d2046d8528e /bin
parentef6b515b6907239b5ecc474fbe6688fe03bcd090 (diff)
downloadsrc-8123f597e99ded2f57a419a20af664353b1271f1.tar.gz
src-8123f597e99ded2f57a419a20af664353b1271f1.zip
ed(1): switch two statements so we check the index before dereferencing.
This is related to r270256 but was missed in that occasion. MFC after: 3 days
Notes
Notes: svn path=/head/; revision=298640
Diffstat (limited to 'bin')
-rw-r--r--bin/ed/cbc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 80ed95a5ebf9..39857212830a 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -257,7 +257,7 @@ expand_des_key(char *obuf, char *kbuf)
/*
* now translate it, bombing on any illegal binary digit
*/
- for (i = 0; kbuf[i] && i < 16; i++)
+ for (i = 0; i < 16 && kbuf[i]; i++)
if ((nbuf[i] = hex_to_binary((int) kbuf[i], 2)) == -1)
des_error("bad binary digit in key");
while (i < 64)