ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kerberos: Use CRT memory allocators. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2021-04-21 09:47:33 +02:00 committed by Alexandre Julliard
parent 1a16994a65
commit 30e07109a7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/kerberos/krb5_ap.c
View File

@ -22,6 +22,7 @@
*/ */
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h>
#include "ntstatus.h" #include "ntstatus.h"
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include "windef.h" #include "windef.h"
@ -32,7 +33,7 @@
#include "ntsecapi.h" #include "ntsecapi.h"
#include "ntsecpkg.h" #include "ntsecpkg.h"
#include "winternl.h" #include "winternl.h"
#include "wine/heap.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "unixlib.h" #include "unixlib.h"
@ -267,7 +268,7 @@ static char *get_str_unixcp( const UNICODE_STRING *str )
{ {
char *ret; char *ret;
int len = WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); int len = WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL );
if (!(ret = heap_alloc( len + 1 ))) return NULL; if (!(ret = malloc( len + 1 ))) return NULL;
WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), ret, len, NULL, NULL ); WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), ret, len, NULL, NULL );
ret[len] = 0; ret[len] = 0;
return ret; return ret;
@ -280,7 +281,7 @@ static char *get_username_unixcp( const WCHAR *user, ULONG user_len, const WCHAR
len_user = WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, NULL, 0, NULL, NULL ); len_user = WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, NULL, 0, NULL, NULL );
len_domain = WideCharToMultiByte( CP_UNIXCP, 0, domain, domain_len, NULL, 0, NULL, NULL ); len_domain = WideCharToMultiByte( CP_UNIXCP, 0, domain, domain_len, NULL, 0, NULL, NULL );
if (!(ret = heap_alloc( len_user + len_domain + 2 ))) return NULL; if (!(ret = malloc( len_user + len_domain + 2 ))) return NULL;
WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, ret, len_user, NULL, NULL ); WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, ret, len_user, NULL, NULL );
ret[len_user] = '@'; ret[len_user] = '@';
@ -295,7 +296,7 @@ static char *get_password_unixcp( const WCHAR *passwd, ULONG passwd_len )
char *ret; char *ret;
len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, passwd, passwd_len, NULL, 0, NULL, NULL ); len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, passwd, passwd_len, NULL, 0, NULL, NULL );
if (!(ret = heap_alloc( len + 1 ))) return NULL; if (!(ret = malloc( len + 1 ))) return NULL;
WideCharToMultiByte( CP_UNIXCP, 0, passwd, passwd_len, ret, len, NULL, NULL ); WideCharToMultiByte( CP_UNIXCP, 0, passwd, passwd_len, ret, len, NULL, NULL );
ret[len] = 0; ret[len] = 0;
return ret; return ret;
@ -328,9 +329,9 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle(
status = krb5_funcs->acquire_credentials_handle( principal, credential_use, username, password, credential, status = krb5_funcs->acquire_credentials_handle( principal, credential_use, username, password, credential,
expiry ); expiry );
done: done:
heap_free( principal ); free( principal );
heap_free( username ); free( username );
heap_free( password ); free( password );
return status; return status;
} }
@ -364,7 +365,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential,
context_attr, expiry ); context_attr, expiry );
if (!status) *mapped_context = TRUE; if (!status) *mapped_context = TRUE;
/* FIXME: initialize context_data */ /* FIXME: initialize context_data */
heap_free( target ); free( target );
return status; return status;
} }
@ -399,7 +400,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info )
DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR);
DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR);
if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; if (!(ret = malloc( sizeof(*ret) + size_name + size_comment ))) return NULL;
ret->fCapabilities = info->fCapabilities; ret->fCapabilities = info->fCapabilities;
ret->wVersion = info->wVersion; ret->wVersion = info->wVersion;
ret->wRPCID = info->wRPCID; ret->wRPCID = info->wRPCID;