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

[utils,smartcard] return after free

Browse Source 
In smartcard_ListReadersA_Call first free up memory and then return in
case of an error
This commit is contained in:
Armin Novak
2024-09-18 14:28:14 +02:00
parent c16e5ffcc2
commit b4755a58dc
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libfreerdp/utils/smartcard_call.c
View File

@@ -335,43 +335,33 @@ static DWORD filter_device_by_name_w(wLinkedList* list, LPWSTR* mszReaders, DWOR
static LONG smartcard_ListReadersA_Call(scard_call_context* smartcard, wStream* out,
SMARTCARD_OPERATION* operation)
{
LONG status = 0;
ListReaders_Return ret = { 0 };
LPSTR mszReaders = NULL;
DWORD cchReaders = 0;
ListReaders_Call* call = NULL;
WINPR_ASSERT(smartcard);
WINPR_ASSERT(out);
WINPR_ASSERT(operation);
call = &operation->call.listReaders;
cchReaders = SCARD_AUTOALLOCATE;
status = ret.ReturnCode = wrap(smartcard, SCardListReadersA, operation->hContext,
(LPCSTR)call->mszGroups, (LPSTR)&mszReaders, &cchReaders);
ListReaders_Call* call = &operation->call.listReaders;
DWORD cchReaders = SCARD_AUTOALLOCATE;
LONG status = ret.ReturnCode = wrap(smartcard, SCardListReadersA, operation->hContext,
(LPCSTR)call->mszGroups, (LPSTR)&mszReaders, &cchReaders);
if (cchReaders == SCARD_AUTOALLOCATE)
return SCARD_F_UNKNOWN_ERROR;
if (status != SCARD_S_SUCCESS)
{
return scard_log_status_error(TAG, "SCardListReadersA", status);
}
cchReaders = filter_device_by_name_a(smartcard->names, &mszReaders, cchReaders);
ret.msz = (BYTE*)mszReaders;
ret.cBytes = cchReaders;
status = smartcard_pack_list_readers_return(out, &ret, FALSE);
if (status != SCARD_S_SUCCESS)
{
return scard_log_status_error(TAG, "smartcard_pack_list_readers_return", status);
}
if (mszReaders)
wrap(smartcard, SCardFreeMemory, operation->hContext, mszReaders);
if (status != SCARD_S_SUCCESS)
return status;
return scard_log_status_error(TAG, "smartcard_pack_list_readers_return", status);
return ret.ReturnCode;
}