# HG changeset patch
# User Florian QuŹ«˛ze <florian@instantbird.org>
# Date 1229313279 0
# Node ID 08414e3d8b4f0177ae910d6ffb3b384e80735276
# Parent  939d173b68b3fdde4188d9084e6df84947ef2b71
Don't allow connecting a SIMPLE account if no server is configured.  Fixes #7767.

committer: John Bailey <rekkanoryo@rekkanoryo.org>

diff -r 939d173b68b3 -r 08414e3d8b4f ChangeLog
--- a/ChangeLog	Mon Dec 15 03:01:38 2008 +0000
+++ b/ChangeLog	Mon Dec 15 03:54:39 2008 +0000
@@ -7,7 +7,6 @@
 	  notifications when the same buddy is in multiple groups (Florian Quèze)
 	* The Buddy State Notification plugin no longer turns JID's, MSN Passport
 	  ID's, etc. into links (Florian Quèze)
-	* Fix a crash in SIMPLE when a malformed message is received.
 	* purple-remote now has a "getstatusmessage" command to retrieve the text
 	  of the current status message.
 	* Various fixes to the nullprpl (Paul Aurich)
@@ -42,6 +41,11 @@
 	  correctly received.
 	* Many other fixes and code cleanup.
 
+	SIMPLE:
+	* Fix a crash when a malformed message is received.
+	* Don't allow connecting accounts if no server name has been specified
+	  (Florian Quèze)
+
 	XMPP:
 	* Fix the namespace URL we look for in PEP reply stanzas to match the URL
 	  used in the 'get' requests (Paul Aurich)
diff -r 939d173b68b3 -r 08414e3d8b4f libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Mon Dec 15 03:01:38 2008 +0000
+++ b/libpurple/protocols/simple/simple.c	Mon Dec 15 03:54:39 2008 +0000
@@ -1939,6 +1939,13 @@
 		sip->txbuf = purple_circ_buffer_new(0);
 
 	userserver = g_strsplit(username, "@", 2);
+	if (userserver[1] == NULL || userserver[1][0] == '\0') {
+		purple_connection_error_reason(gc,
+			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+			_("SIP connect server not specified"));
+		return;
+	}
+
 	purple_connection_set_display_name(gc, userserver[0]);
 	sip->username = g_strdup(userserver[0]);
 	sip->servername = g_strdup(userserver[1]);