On 2024/03/24 14:48:35 -0600, Todd C. Miller <millert@openbsd.org> wrote:
> This simplifies the code and fixes a potential out of bounds read.
> 
>  - todd

reads fine to me, ok op@

side question as it's not introduced with this but shouldn't we also do

--- usr.bin/whois/whois.c
+++ usr.bin/whois/whois.c
@@ -275,7 +275,6 @@ whois(const char *query, const char *server, const cha
 
 		/* Verisign etc. */
 		if (!(flags & WHOIS_SPAM_ME) &&
-		    len >= sizeof(CHOPSPAM)-1 &&
 		    (strncasecmp(buf, CHOPSPAM, sizeof(CHOPSPAM)-1) == 0 ||
 		     strncasecmp(buf, &CHOPSPAM[4], sizeof(CHOPSPAM)-5) == 0)) {
 			printf("\n");


as len is initialy the length of the line, but then the two go out of
sync, and strncasecmp() is safe to call since buf is always
NUL-terminated?