mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed SCardGetAttrib pbAttr=NULL argument

Browse Source 
If fpbAttrIsNULL!=0 set pbAttr NULL on call to SCardGetAttrib
This commit is contained in:
akallabeth 2021-01-25 16:22:50 +01:00 committed by akallabeth
parent 408c865092
commit 082b4b59d3
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
channels/smartcard/client/smartcard_operations.c
View File

@ -1863,31 +1863,30 @@ static LONG smartcard_SetAttrib_Decode(SMARTCARD_DEVICE* smartcard, SMARTCARD_OP
static LONG smartcard_GetAttrib_Call(SMARTCARD_DEVICE* smartcard, SMARTCARD_OPERATION* operation)
{
BOOL autoAllocate = FALSE;
LONG status;
DWORD cbAttrLen;
BOOL autoAllocate;
GetAttrib_Return ret;
DWORD cbAttrLen = 0;
LPBYTE pbAttr = NULL;
GetAttrib_Return ret = { 0 };
IRP* irp = operation->irp;
GetAttrib_Call* call = operation->call;
ret.pbAttr = NULL;
const GetAttrib_Call* call = operation->call;
if (call->fpbAttrIsNULL)
call->cbAttrLen = 0;
autoAllocate = (call->cbAttrLen == SCARD_AUTOALLOCATE) ? TRUE : FALSE;
if (call->cbAttrLen && !autoAllocate)
if (!call->fpbAttrIsNULL)
{
ret.pbAttr = (BYTE*)malloc(call->cbAttrLen);
autoAllocate = (call->cbAttrLen == SCARD_AUTOALLOCATE) ? TRUE : FALSE;
pbAttr = autoAllocate ? (LPBYTE) & (ret.pbAttr) : ret.pbAttr;
cbAttrLen = call->cbAttrLen;
}
if (cbAttrLen && !autoAllocate)
{
ret.pbAttr = (BYTE*)malloc(cbAttrLen);
if (!ret.pbAttr)
return SCARD_E_NO_MEMORY;
}
cbAttrLen = call->cbAttrLen;
ret.ReturnCode =
SCardGetAttrib(operation->hCard, call->dwAttrId,
autoAllocate ? (LPBYTE) & (ret.pbAttr) : ret.pbAttr, &cbAttrLen);
ret.ReturnCode = SCardGetAttrib(operation->hCard, call->dwAttrId, pbAttr, &cbAttrLen);
log_status_error(TAG, "SCardGetAttrib", ret.ReturnCode);
ret.cbAttrLen = cbAttrLen;