From 6ea6ba7a0f9ce11f556330ce9436df977b393df0 Mon Sep 17 00:00:00 2001
From: pfg <pfg@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 29 Apr 2016 03:12:14 +0000
Subject: [PATCH] MFC r298640: ed(1): switch two statements so we check the
 index before dereferencing.

git-svn-id: svn://svn.freebsd.org/base/stable/10@298766 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 bin/ed/cbc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 80ed95a5e..398572128 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)
-- 
2.42.0