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

Fix length return for SCARD_ATTR_VENDOR_NAME

Browse Source
This commit is contained in:
akallabeth 2021-01-27 23:25:57 +01:00
parent 17d8267de7
commit cf2d26dbbd
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
winpr/libwinpr/smartcard/smartcard_pcsc.c
View File

@ -2457,22 +2457,25 @@ static LONG WINAPI PCSC_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE
{
if (dwAttrId == SCARD_ATTR_VENDOR_NAME)
{
const char* vendorName;
if (pbAttr)
{
const char* vendorName;
/**
* pcsc-lite adds a null terminator to the vendor name,
* while WinSCard doesn't. Strip the null terminator.
*/
/**
* pcsc-lite adds a null terminator to the vendor name,
* while WinSCard doesn't. Strip the null terminator.
*/
if (pcbAttrLenAlloc)
vendorName = (char*)*conv.ppb;
else
vendorName = (char*)pbAttr;
if (pcbAttrLenAlloc)
vendorName = (char*)*conv.ppb;
else
vendorName = (char*)pbAttr;
if (vendorName)
*pcbAttrLen = strlen(vendorName);
else
*pcbAttrLen = 0;
if (vendorName)
*pcbAttrLen = strnlen(vendorName, *pcbAttrLen);
else
*pcbAttrLen = 0;
}
}
}
else