Deal with the hostname being a substring of the account name prior to the '@'

Mon, 04 Oct 2010 02:33:28 +0000

author
Daniel Atallah <datallah@pidgin.im>
date
Mon, 04 Oct 2010 02:33:28 +0000
changeset 30826
83e7040d3565
parent 30825
87a79bbdc985
child 30827
80f23383cb29

Deal with the hostname being a substring of the account name prior to the '@'

libpurple/protocols/bonjour/mdns_common.c file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/bonjour/mdns_common.c	Mon Oct 04 00:48:25 2010 +0000
+++ b/libpurple/protocols/bonjour/mdns_common.c	Mon Oct 04 02:33:28 2010 +0000
@@ -265,8 +265,8 @@
 	 * That is what this is intended to deal with.
 	 */
 	if ((tmp = strchr(account_name, '@'))
-	    && strstr(account_name, hostname) == ++tmp
-	    && *(tmp + strlen(hostname)) == '\0')
+	    && strstr(tmp, hostname) == (tmp + 1)
+	    && *((tmp + 1) + strlen(hostname)) == '\0')
 		bd->jid = g_strdup(account_name);
 	else {
 		const char *tmp2;
@@ -284,4 +284,4 @@
 
 		bd->jid = g_string_free(str, FALSE);
 	}
-}
\ No newline at end of file
+}

mercurial