# HG changeset patch # User Paul Aurich # Date 1270928584 0 # Node ID 08957bb38e30e7cc46443d46cd3b5e91fd842b6d # Parent ab168cf2713e04c509969d725f491467df6f5e28 jabber: Check at connection time that the user specified a JID with a node. This was reported by Florian Quze as http://crash-stats.instantbird.com/report/index/6747f742-f02e-4ccf-8214-0ad152100325. The only way I can see that happening is if jid->node is NULL (i.e. my account username is something like "darkrain42.org"). diff -r ab168cf2713e -r 08957bb38e30 libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Sat Apr 10 18:28:45 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Apr 10 19:43:04 2010 +0000 @@ -844,6 +844,14 @@ return NULL; } + if (!js->user->node || *(js->user->node) == '\0') { + purple_connection_error_reason(gc, + PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, + _("Invalid XMPP ID. Username portion must be set.")); + /* Destroying the connection will free the JabberStream */ + return NULL; + } + if (!js->user->domain || *(js->user->domain) == '\0') { purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,