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

Merge pull request #11170 from akallabeth/smartcard-fix

Browse Source 
[utils,smartcard] fix return checks for SCardListReaders
This commit is contained in:
akallabeth
2025-02-13 13:20:20 +01:00
committed by GitHub
parent 99883de3e3 5b1c254f2d
commit b85737e0b8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libfreerdp/utils/smartcard_call.c
View File

@@ -346,8 +346,11 @@ static LONG smartcard_ListReadersA_Call(scard_call_context* smartcard, wStream*
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)
{
if (cchReaders == SCARD_AUTOALLOCATE)
status = SCARD_F_UNKNOWN_ERROR;
}
if (status != SCARD_S_SUCCESS)
{
@@ -399,8 +402,11 @@ static LONG smartcard_ListReadersW_Call(scard_call_context* smartcard, wStream*
cchReaders = SCARD_AUTOALLOCATE;
status = ret.ReturnCode = wrap(smartcard, SCardListReadersW, operation->hContext, string.wz,
(LPWSTR)&mszReaders.pw, &cchReaders);
if (cchReaders == SCARD_AUTOALLOCATE)
return SCARD_F_UNKNOWN_ERROR;
if (status == SCARD_S_SUCCESS)
{
if (cchReaders == SCARD_AUTOALLOCATE)
status = SCARD_F_UNKNOWN_ERROR;
}
if (status != SCARD_S_SUCCESS)
{