morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Treat OOM cases

Browse Source
This commit is contained in:
Hardening
2014-04-09 16:07:06 +02:00
parent aa466a85e0
commit 1d1844aabd
4 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libfreerdp/core/gateway/ncacn_http.c
View File

@@ -307,25 +307,34 @@ rdpNtlmHttp* ntlm_http_new()
{
rdpNtlmHttp* ntlm_http;
ntlm_http = (rdpNtlmHttp*) malloc(sizeof(rdpNtlmHttp));
ntlm_http = (rdpNtlmHttp *)calloc(1, sizeof(rdpNtlmHttp));
if (ntlm_http != NULL)
{
ZeroMemory(ntlm_http, sizeof(rdpNtlmHttp));
ntlm_http->ntlm = ntlm_new();
ntlm_http->context = http_context_new();
}
if (!ntlm_http)
return NULL;
ntlm_http->ntlm = ntlm_new();
if (!ntlm_http->ntlm)
goto out_free;
ntlm_http->context = http_context_new();
if (!ntlm_http->context)
goto out_free_ntlm;
return ntlm_http;
out_free_ntlm:
ntlm_free(ntlm_http->ntlm);
out_free:
return NULL;
}
void ntlm_http_free(rdpNtlmHttp* ntlm_http)
{
if (ntlm_http != NULL)
{
ntlm_free(ntlm_http->ntlm);
http_context_free(ntlm_http->context);
if (!ntlm_http)
return;
free(ntlm_http);
}
ntlm_free(ntlm_http->ntlm);
http_context_free(ntlm_http->context);
free(ntlm_http);
}

9
libfreerdp/core/gateway/ntlm.c
View File

@@ -286,14 +286,7 @@ void ntlm_client_uninit(rdpNtlm* ntlm)
rdpNtlm* ntlm_new()
{
rdpNtlm* ntlm = (rdpNtlm*) malloc(sizeof(rdpNtlm));
if (ntlm != NULL)
{
ZeroMemory(ntlm, sizeof(rdpNtlm));
}
return ntlm;
return (rdpNtlm *)calloc(1, sizeof(rdpNtlm));
}
void ntlm_free(rdpNtlm* ntlm)

13
libfreerdp/crypto/certificate.c
View File

@@ -264,15 +264,14 @@ rdpCertificateStore* certificate_store_new(rdpSettings* settings)
{
rdpCertificateStore* certificate_store;
certificate_store = (rdpCertificateStore*) malloc(sizeof(rdpCertificateStore));
certificate_store = (rdpCertificateStore *)calloc(1, sizeof(rdpCertificateStore));
if (certificate_store != NULL)
{
ZeroMemory(certificate_store, sizeof(rdpCertificateStore));
if (!certificate_store)
return NULL;
certificate_store->settings = settings;
certificate_store_init(certificate_store);
}
certificate_store->settings = settings;
certificate_store_init(certificate_store);
/* TODO: certificate_store_init should not fail silently */
return certificate_store;
}

5
winpr/libwinpr/thread/thread.c
View File

@@ -100,8 +100,9 @@ HANDLE CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize
HANDLE handle;
WINPR_THREAD* thread;
thread = (WINPR_THREAD*) malloc(sizeof(WINPR_THREAD));
ZeroMemory(thread, sizeof(WINPR_THREAD));
thread = (WINPR_THREAD*) calloc(1, sizeof(WINPR_THREAD));
if (!thread)
return NULL;
thread->started = FALSE;
thread->dwStackSize = dwStackSize;