move response-limitation to a more appropriate place
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1316 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
58280c0b72
commit
bb039e933b
21
scard.c
21
scard.c
@ -1509,16 +1509,6 @@ TS_SCardTransmit(STREAM in, STREAM out)
|
|||||||
|
|
||||||
if (cbRecvLength)
|
if (cbRecvLength)
|
||||||
{
|
{
|
||||||
/* FIXME: handle responses with length > 448 bytes */
|
|
||||||
if (cbRecvLength > 448)
|
|
||||||
{
|
|
||||||
#ifdef WITH_SCARD_DEBUG
|
|
||||||
printf("[RECV LEN %d -> %d]\n", (unsigned int) cbRecvLength, 400);
|
|
||||||
#endif
|
|
||||||
cbRecvLength = 448;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
recvBuf = SC_xmalloc(&lcHandle, cbRecvLength);
|
recvBuf = SC_xmalloc(&lcHandle, cbRecvLength);
|
||||||
if (!recvBuf)
|
if (!recvBuf)
|
||||||
return SC_returnNoMemoryError(&lcHandle, in, out);
|
return SC_returnNoMemoryError(&lcHandle, in, out);
|
||||||
@ -1598,6 +1588,17 @@ TS_SCardTransmit(STREAM in, STREAM out)
|
|||||||
rv = SCardTransmit(myHCard, myPioSendPci, sendBuf, (MYPCSC_DWORD) cbSendLength,
|
rv = SCardTransmit(myHCard, myPioSendPci, sendBuf, (MYPCSC_DWORD) cbSendLength,
|
||||||
myPioRecvPci, recvBuf, &myCbRecvLength);
|
myPioRecvPci, recvBuf, &myCbRecvLength);
|
||||||
cbRecvLength = myCbRecvLength;
|
cbRecvLength = myCbRecvLength;
|
||||||
|
|
||||||
|
/* FIXME: handle responses with length > 448 bytes */
|
||||||
|
if (cbRecvLength > 448)
|
||||||
|
{
|
||||||
|
warning("Card response limited from %d to 448 bytes!\n", cbRecvLength);
|
||||||
|
#ifdef WITH_SCARD_DEBUG
|
||||||
|
printf("[RECV LEN %d -> %d]\n", (unsigned int) cbRecvLength, 400);
|
||||||
|
#endif
|
||||||
|
cbRecvLength = 448;
|
||||||
|
}
|
||||||
|
|
||||||
if (pioRecvPci)
|
if (pioRecvPci)
|
||||||
{
|
{
|
||||||
copyIORequest_MyPCSCToServer(myPioRecvPci, pioRecvPci);
|
copyIORequest_MyPCSCToServer(myPioRecvPci, pioRecvPci);
|
||||||
|
Loading…
Reference in New Issue
Block a user