pidgin: 23ad404d: Don't allow connecting a SIMPLE account ...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 23ad404d0d25182520679ac9d4ab4c7517766f04
Ancestor: 10ea019ecb33303883a9a34e547d2c04b8267a3d
Author: florian at instantbird.org
Date: 2008-12-15T03:54:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/23ad404d0d25182520679ac9d4ab4c7517766f04

Modified files:
        ChangeLog libpurple/protocols/simple/simple.c

ChangeLog: 

Don't allow connecting a SIMPLE account if no server is configured.  Fixes #7767.

-------------- next part --------------
============================================================
--- ChangeLog	bba479d8316f7306214f66f874bc9a77ae005b05
+++ ChangeLog	196c4b9d58cba9489cf02e7e31735a42356db8cb
@@ -7,7 +7,6 @@ version 2.5.3 (12/??/2008):
 	  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 @@ version 2.5.3 (12/??/2008):
 	  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)
============================================================
--- libpurple/protocols/simple/simple.c	6715b5dda3fbfcafc3745fa4bc9c6d94cf0ca0ae
+++ libpurple/protocols/simple/simple.c	3b88cc06fa54cd7ddf2f5fe97c4826e83ba76e82
@@ -1939,6 +1939,13 @@ static void simple_login(PurpleAccount *
 		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]);