# HG changeset patch # User Luke Schierer # Date 1192942929 0 # Node ID 36da9249f3a9d36c8eb5d5779a9d2a3e446decda # Parent 39a7c295c63c7e54d80bb34bd84750eedae60c81 applied changes from e33c17e58da161b8cffaf13e9d79e9bb4b9ce4ce through e2f6be4e0c0daee25fdb3250a7e16a881922f8c4 diff -r 39a7c295c63c -r 36da9249f3a9 libpurple/proxy.c --- a/libpurple/proxy.c Sun Oct 21 05:01:17 2007 +0000 +++ b/libpurple/proxy.c Sun Oct 21 05:02:09 2007 +0000 @@ -690,11 +690,12 @@ gchar *tmp = ntlm; guint8 *nonce; gchar *domain = (gchar*)purple_proxy_info_get_username(connect_data->gpi); - gchar *username; + gchar *username = NULL; gchar *request; gchar *response; - username = strchr(domain, '\\'); + if (domain != NULL) + username = strchr(domain, '\\'); if (username == NULL) { purple_proxy_connect_data_disconnect_formatted(connect_data, @@ -738,9 +739,11 @@ } else if((ntlm = g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: NTLM"))) { /* Empty message */ gchar request[2048]; gchar *domain = (gchar*) purple_proxy_info_get_username(connect_data->gpi); - gchar *username; + gchar *username = NULL; int request_len; - username = strchr(domain, '\\'); + + if (domain != NULL) + username = strchr(domain, '\\'); if (username == NULL) { purple_proxy_connect_data_disconnect_formatted(connect_data,