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

libwinpr-smartcard: fix SCardGetAttrib for friendly name (unicode)

Browse Source
This commit is contained in:
Marc-André Moreau 2014-05-05 17:27:29 -04:00
parent 9e407e6e22
commit 38c77eb57c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1934,6 +1934,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWOR
int length = 0; int length = 0;
char* namePCSC; char* namePCSC;
char* nameWinSCard; char* nameWinSCard;
DWORD cbAttrLen = 0;
char* pbAttrA = NULL; char* pbAttrA = NULL;
WCHAR* pbAttrW = NULL; WCHAR* pbAttrW = NULL;
SCARDCONTEXT hContext; SCARDCONTEXT hContext;
@ -1947,6 +1948,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWOR
if (!hContext) if (!hContext)
return SCARD_E_INVALID_HANDLE; return SCARD_E_INVALID_HANDLE;
cbAttrLen = *pcbAttrLen;
*pcbAttrLen = SCARD_AUTOALLOCATE; *pcbAttrLen = SCARD_AUTOALLOCATE;
status = PCSC_SCardGetAttrib_Internal(hCard, SCARD_ATTR_DEVICE_FRIENDLY_NAME_A, status = PCSC_SCardGetAttrib_Internal(hCard, SCARD_ATTR_DEVICE_FRIENDLY_NAME_A,
@ -2004,7 +2006,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWOR
if (!friendlyNameW) if (!friendlyNameW)
return SCARD_E_NO_MEMORY; return SCARD_E_NO_MEMORY;
if (*pcbAttrLen == SCARD_AUTOALLOCATE) if (cbAttrLen == SCARD_AUTOALLOCATE)
{ {
*pPbAttr = (BYTE*) friendlyNameW; *pPbAttr = (BYTE*) friendlyNameW;
*pcbAttrLen = length * 2; *pcbAttrLen = length * 2;
@ -2012,7 +2014,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWOR
} }
else else
{ {
if (((length + 1) * 2) > *pcbAttrLen) if (((length + 1) * 2) > cbAttrLen)
{ {
free(friendlyNameW); free(friendlyNameW);
return SCARD_E_INSUFFICIENT_BUFFER; return SCARD_E_INSUFFICIENT_BUFFER;
@ -2027,7 +2029,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWOR
} }
else else
{ {
if (*pcbAttrLen == SCARD_AUTOALLOCATE) if (cbAttrLen == SCARD_AUTOALLOCATE)
{ {
*pPbAttr = (BYTE*) friendlyNameA; *pPbAttr = (BYTE*) friendlyNameA;
*pcbAttrLen = length; *pcbAttrLen = length;
@ -2035,7 +2037,7 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib_FriendlyName(SCARDHANDLE hCard, DWOR
} }
else else
{ {
if ((length + 1) > *pcbAttrLen) if ((length + 1) > cbAttrLen)
{ {
free(friendlyNameA); free(friendlyNameA);
return SCARD_E_INSUFFICIENT_BUFFER; return SCARD_E_INSUFFICIENT_BUFFER;
@ -2080,7 +2082,8 @@ WINSCARDAPI LONG WINAPI PCSC_SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, L
if ((dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_A) || (dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_W)) if ((dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_A) || (dwAttrId == SCARD_ATTR_DEVICE_FRIENDLY_NAME_W))
{ {
return PCSC_SCardGetAttrib_FriendlyName(hCard, dwAttrId, pbAttr, pcbAttrLen); status = PCSC_SCardGetAttrib_FriendlyName(hCard, dwAttrId, pbAttr, pcbAttrLen);
return status;
} }
status = PCSC_SCardGetAttrib_Internal(hCard, dwAttrId, pbAttr, pcbAttrLen); status = PCSC_SCardGetAttrib_Internal(hCard, dwAttrId, pbAttr, pcbAttrLen);