Fix ClientID parsing.

1 files changed, 5 insertions, 5 deletions

diff --git a/net.c b/net.c
index 3404c9a4..ab5dd27d 100644
--- a/net.c
+++ b/net.c
@@ -148,11 +148,6 @@ hwaddr_aton(unsigned char *buffer, const char *addr)
 	while (*p) {
 		c[0] = *p++;
 		c[1] = *p++;
-		/* Ensure that next data is EOL or a seperator with data */
-		if (!(*p == '\0' || (*p == ':' && *(p + 1) != '\0'))) {
-			errno = EINVAL;
-			return 0;
-		}
 		/* Ensure that digits are hex */
 		if (isxdigit((unsigned char)c[0]) == 0 ||
 		    isxdigit((unsigned char)c[1]) == 0)
@@ -160,6 +155,11 @@ hwaddr_aton(unsigned char *buffer, const char *addr)
 			errno = EINVAL;
 			return 0;
 		}
+		/* Ensure that next data is EOL or a seperator with data */
+		if (!(*p == '\0' || (*p == ':' && *(p + 1) != '\0'))) {
+			errno = EINVAL;
+			return 0;
+		}
 		if (*p)
 			p++;
 		if (bp)