diff --git a/include/common/standard.h b/include/common/standard.h
index b1db8213b..6946ded37 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -411,14 +411,14 @@ unsigned int inetaddr_host_lim_ret(char *text, char *stop, char **ret);
 
 static inline char *cut_crlf(char *s) {
 
-	while (*s != '\r' || *s == '\n') {
+	while (*s != '\r' && *s != '\n') {
 		char *p = s++;
 
 		if (!*p)
 			return p;
 	}
 
-	*s++ = 0;
+	*s++ = '\0';
 
 	return s;
 }