mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leaks.

This commit is contained in:
Armin Novak 2014-11-16 22:58:36 +01:00
parent 55e455f1ab
commit e8c7d97c9d
1 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libfreerdp/common/assistance.c
View File

@ -509,15 +509,32 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* pas
pbIn = (BYTE*) calloc(1, EncryptedSize);
pbOut = (BYTE*) calloc(1, EncryptedSize);
if (!pbIn)
if (!pbIn || !pbOut)
{
free(PasswordW);
free(PassStubW);
if (pbIn)
free (pbIn);
if (pbOut)
free (pbOut);
return NULL;
}
if (!EncryptedSize)
{
free(PasswordW);
free(PassStubW);
free (pbIn);
free (pbOut);
return NULL;
}
*((UINT32*) pbIn) = cbPassStubW;
CopyMemory(&pbIn[4], PassStubW, cbPassStubW);
free(PasswordW);
free(PassStubW);
EVP_CIPHER_CTX_init(&rc4Ctx);
status = EVP_EncryptInit_ex(&rc4Ctx, EVP_rc4(), NULL, NULL, NULL);
@ -525,6 +542,8 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* pas
if (!status)
{
WLog_ERR(TAG, "EVP_CipherInit_ex failure");
free (pbOut);
free (pbIn);
return NULL;
}
@ -533,6 +552,8 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* pas
if (!status)
{
WLog_ERR(TAG, "EVP_CipherInit_ex failure");
free (pbOut);
free (pbIn);
return NULL;
}
@ -540,10 +561,12 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* pas
cbIn = EncryptedSize;
status = EVP_EncryptUpdate(&rc4Ctx, pbOut, &cbOut, pbIn, cbIn);
free(pbIn);
if (!status)
{
WLog_ERR(TAG, "EVP_CipherUpdate failure");
free (pbOut);
return NULL;
}
@ -552,15 +575,12 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* password, const char* pas
if (!status)
{
WLog_ERR(TAG, "EVP_CipherFinal_ex failure");
free (pbOut);
return NULL;
}
EVP_CIPHER_CTX_cleanup(&rc4Ctx);
free(pbIn);
free(PasswordW);
free(PassStubW);
*pEncryptedSize = EncryptedSize;
return pbOut;
@ -596,7 +616,11 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* file, const char* password)
DerivedKey, sizeof(DerivedKey));
if (status < 0)
{
if (PasswordW)
free (PasswordW);
return -1;
}
ZeroMemory(InitializationVector, sizeof(InitializationVector));
@ -605,7 +629,11 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* file, const char* password)
status = EVP_DecryptInit_ex(&aesDec, EVP_aes_128_cbc(), NULL, NULL, NULL);
if (status != 1)
{
if (PasswordW)
free (PasswordW);
return -1;
}
EVP_CIPHER_CTX_set_key_length(&aesDec, (128 / 8));
EVP_CIPHER_CTX_set_padding(&aesDec, 0);
@ -613,7 +641,11 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* file, const char* password)
status = EVP_DecryptInit_ex(&aesDec, EVP_aes_128_cbc(), NULL, DerivedKey, InitializationVector);
if (status != 1)
{
if (PasswordW)
free (PasswordW);
return -1;
}
cbOut = cbFinal = 0;
cbIn = file->EncryptedLHTicketLength;
@ -621,18 +653,30 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* file, const char* password)
pbOut = (BYTE*) calloc(1, cbIn + AES_BLOCK_SIZE + 2);
if (!pbOut)
{
if (PasswordW)
free (PasswordW);
return -1;
}
status = EVP_DecryptUpdate(&aesDec, pbOut, &cbOut, pbIn, cbIn);
if (status != 1)
{
if (PasswordW)
free (PasswordW);
free (pbOut);
return -1;
}
status = EVP_DecryptFinal_ex(&aesDec, pbOut + cbOut, &cbFinal);
if (status != 1)
{
WLog_ERR(TAG, "EVP_DecryptFinal_ex failure");
if (PasswordW)
free (PasswordW);
free (pbOut);
return -1;
}
@ -647,12 +691,14 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* file, const char* password)
file->ConnectionString2 = NULL;
status = ConvertFromUnicode(CP_UTF8, 0, pbOutW, cchOutW, &file->ConnectionString2, 0, NULL, NULL);
if (status <= 0)
return -1;
free(PasswordW);
free(pbOut);
if (status <= 0)
{
return -1;
}
status = freerdp_assistance_parse_connection_string2(file);
WLog_DBG(TAG, "freerdp_assistance_parse_connection_string2: %d", status);
return 1;