From c716f3fee681531cadf6c6d89999f07ad39fcb3a Mon Sep 17 00:00:00 2001 From: danfe Date: Fri, 29 Apr 2016 13:58:01 +0000 Subject: [PATCH] MFC r270256, r298640: ed(1): switch two statements so we check the index before dereferencing. Approved by: pfg git-svn-id: svn://svn.freebsd.org/base/stable/8@298785 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- bin/ed/cbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c index 52e99998d..7d8113c7e 100644 --- a/bin/ed/cbc.c +++ b/bin/ed/cbc.c @@ -243,7 +243,7 @@ expand_des_key(char *obuf, char *kbuf) /* * now translate it, bombing on any illegal hex 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], 16)) == -1) des_error("bad hex digit in key"); while (i < 16) @@ -263,7 +263,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) -- 2.42.0