# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1246681722 0
# Node ID c3b1711991fc05a8c7d9d86149027b8436ed7e03
# Parent  e8ac5369d567b60e6944882f402e4bb1c7d9f0c9# Parent  c65ad9007e421968a2af22f4708a4d1ad88d5378
merge of '7743dd71673c71e91039e890a3a939f9850f2d16'
     and 'aed601f22fca91705bab1c3dd963575547419e64'

diff -r c65ad9007e42 -r c3b1711991fc libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sat Jul 04 04:27:48 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Jul 04 04:28:42 2009 +0000
@@ -1882,7 +1882,7 @@
 		switch (info->errorcode) {
 		case 0x01:
 			/* Unregistered username */
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_USERNAME, _("Invalid username."));
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_USERNAME, _("Username does not exist"));
 			break;
 		case 0x05:
 			/* Incorrect password */
@@ -1917,7 +1917,7 @@
 			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait a minute and try again. If you continue to try, you will need to wait even longer."));
 			break;
 		default:
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Authentication failed"));
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Unknown reason"));
 			break;
 		}
 		purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);
diff -r c65ad9007e42 -r c3b1711991fc libpurple/util.c
--- a/libpurple/util.c	Sat Jul 04 04:27:48 2009 +0000
+++ b/libpurple/util.c	Sat Jul 04 04:28:42 2009 +0000
@@ -3814,7 +3814,10 @@
 		}
 
 		/* Advance to the start of the data */
-		s = strstr(s, "\r\n") + 2;
+		s = strstr(s, "\r\n");
+		if (s == NULL)
+			break;
+		s += 2;
 
 		if (s + sz > data + *len) {
 			purple_debug_error("util", "Error processing chunked data: "