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

smartcard: Teoretical fix of uninitialized values

Browse Source 
This tries to fixes the following defects reported by covscan tool:
 - channels/smartcard/client/smartcard_operations.c:958: uninit_use_in_call: Using uninitialized value "ret.cReaders" when calling "smartcard_pack_locate_cards_return".
 - channels/smartcard/client/smartcard_operations.c:932: uninit_use_in_call: Using uninitialized value "ret.cReaders" when calling "smartcard_pack_locate_cards_return".

But I am not sure about it...
This commit is contained in:
Ondrej Holy 2020-06-03 13:03:11 +02:00 committed by akallabeth
parent 7554154a04
commit c03f68059d
1 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -921,15 +921,38 @@ static LONG smartcard_LocateCardsA_Call(SMARTCARD_DEVICE* smartcard, SMARTCARD_O
ret.ReturnCode = SCardLocateCardsA(operation->hContext, call->mszCards, call->rgReaderStates,
call->cReaders);
log_status_error(TAG, "SCardLocateCardsA", ret.ReturnCode);
ret.cReaders = call->cReaders;
ret.rgReaderStates = NULL;
free(call->mszCards);
if (ret.cReaders > 0)
{
ret.rgReaderStates = (ReaderState_Return*)calloc(ret.cReaders, sizeof(ReaderState_Return));
if (!ret.rgReaderStates)
return STATUS_NO_MEMORY;
}
for (x = 0; x < ret.cReaders; x++)
{
ret.rgReaderStates[x].dwCurrentState = call->rgReaderStates[x].dwCurrentState;
ret.rgReaderStates[x].dwEventState = call->rgReaderStates[x].dwEventState;
ret.rgReaderStates[x].cbAtr = call->rgReaderStates[x].cbAtr;
CopyMemory(&(ret.rgReaderStates[x].rgbAtr), &(call->rgReaderStates[x].rgbAtr),
sizeof(ret.rgReaderStates[x].rgbAtr));
}
status = smartcard_pack_locate_cards_return(smartcard, irp->output, &ret);
for (x = 0; x < call->cReaders; x++)
{
SCARD_READERSTATEA* state = &call->rgReaderStates[x];
free(state->szReader);
}
free(call->rgReaderStates);
status = smartcard_pack_locate_cards_return(smartcard, irp->output, &ret);
if (status != SCARD_S_SUCCESS)
return status;
@ -947,15 +970,38 @@ static LONG smartcard_LocateCardsW_Call(SMARTCARD_DEVICE* smartcard, SMARTCARD_O
ret.ReturnCode = SCardLocateCardsW(operation->hContext, call->mszCards, call->rgReaderStates,
call->cReaders);
log_status_error(TAG, "SCardLocateCardsW", ret.ReturnCode);
ret.cReaders = call->cReaders;
ret.rgReaderStates = NULL;
free(call->mszCards);
if (ret.cReaders > 0)
{
ret.rgReaderStates = (ReaderState_Return*)calloc(ret.cReaders, sizeof(ReaderState_Return));
if (!ret.rgReaderStates)
return STATUS_NO_MEMORY;
}
for (x = 0; x < ret.cReaders; x++)
{
ret.rgReaderStates[x].dwCurrentState = call->rgReaderStates[x].dwCurrentState;
ret.rgReaderStates[x].dwEventState = call->rgReaderStates[x].dwEventState;
ret.rgReaderStates[x].cbAtr = call->rgReaderStates[x].cbAtr;
CopyMemory(&(ret.rgReaderStates[x].rgbAtr), &(call->rgReaderStates[x].rgbAtr),
sizeof(ret.rgReaderStates[x].rgbAtr));
}
status = smartcard_pack_locate_cards_return(smartcard, irp->output, &ret);
for (x = 0; x < call->cReaders; x++)
{
SCARD_READERSTATEW* state = &call->rgReaderStates[x];
free(state->szReader);
}
free(call->rgReaderStates);
status = smartcard_pack_locate_cards_return(smartcard, irp->output, &ret);
if (status != SCARD_S_SUCCESS)
return status;