diff options
| author | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 05:02:09 +0000 |
|---|---|---|
| committer | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 05:02:09 +0000 |
| commit | 4061513d754ddc6d1c38f0566cee51a1ee138070 (patch) | |
| tree | 5d4ca81433f99c25a1c7cd25ccd5d986fdf16a32 | |
| parent | da4b3188f6b636c159fb94ec2185f1520e4dedb7 (diff) | |
| download | pidgin-4061513d754ddc6d1c38f0566cee51a1ee138070.tar.gz | |
applied changes from e33c17e58da161b8cffaf13e9d79e9bb4b9ce4ce
through e2f6be4e0c0daee25fdb3250a7e16a881922f8c4
| -rw-r--r-- | libpurple/proxy.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libpurple/proxy.c b/libpurple/proxy.c index becab0d766..8684e1234f 100644 --- a/libpurple/proxy.c +++ b/libpurple/proxy.c @@ -690,11 +690,12 @@ http_canread(gpointer data, gint source, PurpleInputCondition cond) 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 @@ http_canread(gpointer data, gint source, PurpleInputCondition cond) } 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, |