generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sasl_sspi: Fixed Unicode build

Browse Source 
Bug: http://curl.haxx.se/bug/view.cgi?id=1422
Verified-by: Steve Holme
This commit is contained in:
Marcel Raad 2014-09-10 14:32:56 +02:00 committed by Steve Holme
parent 06b27ea24c
commit bd3df5ec6d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/curl_sasl_sspi.c
View File

@ -85,8 +85,7 @@ TCHAR *Curl_sasl_build_spn(const char *service, const char *host)
} }
/* Release the UTF8 variant when operating with Unicode */ /* Release the UTF8 variant when operating with Unicode */
if(utf8_spn != tchar_spn) Curl_unicodefree(utf8_spn);
Curl_safefree(utf8_spn);
/* Return our newly allocated SPN */ /* Return our newly allocated SPN */
return tchar_spn; return tchar_spn;
@ -485,8 +484,7 @@ CURLcode Curl_sasl_create_gssapi_security_message(struct SessionHandle *data,
SecPkgContext_Sizes sizes; SecPkgContext_Sizes sizes;
SecPkgCredentials_Names names; SecPkgCredentials_Names names;
SECURITY_STATUS status; SECURITY_STATUS status;
char *user_name;
/* TODO: Verify the unicodeness of this function */
/* Decode the base-64 encoded input message */ /* Decode the base-64 encoded input message */
if(strlen(chlg64) && *chlg64 != '=') { if(strlen(chlg64) && *chlg64 != '=') {
@ -577,12 +575,22 @@ CURLcode Curl_sasl_create_gssapi_security_message(struct SessionHandle *data,
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
/* Convert the user name to UTF8 when operating with Unicode */
user_name = Curl_convert_tchar_to_UTF8(names.sUserName);
if(!user_name) {
Curl_safefree(trailer);
Curl_safefree(chlg);
return CURLE_OUT_OF_MEMORY;
}
/* Allocate our message */ /* Allocate our message */
messagelen = 4 + strlen(names.sUserName) + 1; messagelen = 4 + strlen(user_name) + 1;
message = malloc(messagelen); message = malloc(messagelen);
if(!message) { if(!message) {
Curl_safefree(trailer); Curl_safefree(trailer);
Curl_safefree(chlg); Curl_safefree(chlg);
Curl_unicodefree(user_name);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
@ -593,7 +601,8 @@ CURLcode Curl_sasl_create_gssapi_security_message(struct SessionHandle *data,
identity is not terminated with the zero-valued (%x00) octet." it seems identity is not terminated with the zero-valued (%x00) octet." it seems
necessary to include it. */ necessary to include it. */
memcpy(message, &outdata, 4); memcpy(message, &outdata, 4);
strcpy((char *)message + 4, names.sUserName); strcpy((char *)message + 4, user_name);
Curl_unicodefree(user_name);
/* Allocate the padding */ /* Allocate the padding */
padding = malloc(sizes.cbBlockSize); padding = malloc(sizes.cbBlockSize);