pidgin: eb042072: oscar: Fix a clientLogin error crash (nu...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: eb042072cbcb4bb27898156d0ed80deaf9f10ab3
Ancestor: 0ccdd3af3ce1a841d971243d23614ae0630ecce3
Author: darkrain42 at pidgin.im
Date: 2010-04-10T22:48:48
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/eb042072cbcb4bb27898156d0ed80deaf9f10ab3

Modified files:
        libpurple/protocols/oscar/clientlogin.c

ChangeLog: 

oscar: Fix a clientLogin error crash (null printf bug).  Closes #11662

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/clientlogin.c	d0cadb891abb127afc87d7ace6bd21745b70c340
+++ libpurple/protocols/oscar/clientlogin.c	8fcbcf7cad3334f38a258c906e0d38b48a0a2c55
@@ -515,8 +515,12 @@ static void client_login_cb(PurpleUtilFe
 
 	if (error_message != NULL || len == 0) {
 		gchar *tmp;
-		tmp = g_strdup_printf(_("Error requesting %s: %s"),
-				URL_CLIENT_LOGIN, error_message);
+		if (error_message != NULL)
+			tmp = g_strdup_printf(_("Error requesting %s: %s"),
+					URL_CLIENT_LOGIN, error_message);
+		else
+			tmp = g_strdup_printf(_("Error requesting %s"),
+					URL_CLIENT_LOGIN);
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);