# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1247298903 0
# Node ID f1f901b3d6f230643516204f474cbc71289d8e09
# Parent  ef48fb87d8d208f0ae34212d5f7430de799f4baa
Save one traversal of the domain for IPv6 validation.

diff -r ef48fb87d8d2 -r f1f901b3d6f2 libpurple/protocols/jabber/jutil.c
--- a/libpurple/protocols/jabber/jutil.c	Sat Jul 11 07:47:45 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Sat Jul 11 07:55:03 2009 +0000
@@ -57,27 +57,28 @@
 gboolean jabber_domain_validate(const char *str)
 {
 	const char *c;
+	size_t len;
 
 	if(!str)
 		return TRUE;
 
-	if(strlen(str) > 1023)
+	len = strlen(str);
+	if (len > 1023)
 		return FALSE;
 
 	c = str;
 
 	if (*c == '[') {
 		/* Check if str is a valid IPv6 identifier */
-		const gchar *end_bracket = strstr(c, "]");
 		gboolean valid = FALSE;
 
-		if (!end_bracket || *(end_bracket + 1) != '\0')
+		if (*(c + len - 1) != ']')
 			return FALSE;
 
 		/* Ugly, but in-place */
-		*(gchar *)end_bracket = '\0';
+		*(gchar *)(c + len - 1) = '\0';
 		valid = purple_ipv6_address_is_valid(c + 1);
-		*(gchar *)end_bracket = ']';
+		*(gchar *)(c + len - 1) = ']';
 
 		return valid;
 	}