# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1270939728 0
# Node ID 519905ba5f7516a59759e5fa414fb343bb9f3ff5
# Parent  8474495b9dfc9686fc7a94a4ce9e1310cb938abf
oscar: Fix a clientLogin error crash (null printf bug).  Closes #11662

diff -r 8474495b9dfc -r 519905ba5f75 libpurple/protocols/oscar/clientlogin.c
--- a/libpurple/protocols/oscar/clientlogin.c	Sat Apr 10 21:28:45 2010 +0000
+++ b/libpurple/protocols/oscar/clientlogin.c	Sat Apr 10 22:48:48 2010 +0000
@@ -515,8 +515,12 @@
 
 	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);