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

Fixed clang warnings.

Browse Source
This commit is contained in:
Armin Novak 2013-09-13 09:47:18 +02:00
parent 7cf95bcf6e
commit cbf5e7e3f8
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,8 +331,10 @@ static BOOL check_reader_is_forwarded(SMARTCARD_DEVICE *scard, const char *reade
str = strtok(NULL, " "); str = strtok(NULL, " ");
} }
if (!strpos)
goto finally;
pos = strtol(strpos, NULL, 10); pos = strtol(strpos, NULL, 10);
status = strtol(strstatus, NULL, 10);
if ( strpos && strstatus ) if ( strpos && strstatus )
{ {
@ -351,6 +353,7 @@ static BOOL check_reader_is_forwarded(SMARTCARD_DEVICE *scard, const char *reade
else else
DEBUG_WARN("unknown reader format '%s'", readerName); DEBUG_WARN("unknown reader format '%s'", readerName);
finally:
free(name); free(name);
if (!rc) if (!rc)
@ -617,7 +620,7 @@ static UINT32 handle_EstablishContext(SMARTCARD_DEVICE* scard, IRP* irp, size_t
/* TODO: store hContext in allowed context list */ /* TODO: store hContext in allowed context list */
smartcard_output_alignment(irp, 8); smartcard_output_alignment(irp, 8);
return SCARD_S_SUCCESS; return status;
} }
static UINT32 handle_ReleaseContext(SMARTCARD_DEVICE* scard, IRP* irp, size_t inlen) static UINT32 handle_ReleaseContext(SMARTCARD_DEVICE* scard, IRP* irp, size_t inlen)
@ -729,7 +732,6 @@ static UINT32 handle_ListReaders(SMARTCARD_DEVICE* scard, IRP* irp,
/* ignore rest of [MS-RDPESC] 2.2.2.4 ListReaders_Call */ /* ignore rest of [MS-RDPESC] 2.2.2.4 ListReaders_Call */
status = SCARD_S_SUCCESS;
#ifdef SCARD_AUTOALLOCATE #ifdef SCARD_AUTOALLOCATE
dwReaders = SCARD_AUTOALLOCATE; dwReaders = SCARD_AUTOALLOCATE;
status = SCardListReaders(hContext, NULL, (LPSTR) &readerList, &dwReaders); status = SCardListReaders(hContext, NULL, (LPSTR) &readerList, &dwReaders);
@ -1323,7 +1325,7 @@ static UINT32 handle_State(SMARTCARD_DEVICE* scard, IRP* irp, size_t inlen)
DWORD state = 0, protocol = 0; DWORD state = 0, protocol = 0;
DWORD readerLen; DWORD readerLen;
DWORD atrLen = MAX_ATR_SIZE; DWORD atrLen = MAX_ATR_SIZE;
char* readerName; char* readerName = NULL;
BYTE pbAtr[MAX_ATR_SIZE]; BYTE pbAtr[MAX_ATR_SIZE];
#ifdef WITH_DEBUG_SCARD #ifdef WITH_DEBUG_SCARD
@ -1426,9 +1428,9 @@ static DWORD handle_Status(SMARTCARD_DEVICE *scard, IRP* irp, size_t inlen, BOOL
DWORD state, protocol; DWORD state, protocol;
DWORD readerLen = 0; DWORD readerLen = 0;
DWORD atrLen = MAX_ATR_SIZE; DWORD atrLen = MAX_ATR_SIZE;
char* readerName; char* readerName = NULL;
BYTE pbAtr[MAX_ATR_SIZE]; BYTE *pbAtr = NULL;
UINT32 dataLength; UINT32 dataLength = 0;
int pos, poslen1, poslen2; int pos, poslen1, poslen2;
#ifdef WITH_DEBUG_SCARD #ifdef WITH_DEBUG_SCARD
@ -1469,6 +1471,7 @@ static DWORD handle_Status(SMARTCARD_DEVICE *scard, IRP* irp, size_t inlen, BOOL
goto finish; goto finish;
} }
pbAtr = malloc(sizeof(BYTE) * atrLen);
#ifdef SCARD_AUTOALLOCATE #ifdef SCARD_AUTOALLOCATE
readerLen = SCARD_AUTOALLOCATE; readerLen = SCARD_AUTOALLOCATE;
@ -1513,7 +1516,8 @@ static DWORD handle_Status(SMARTCARD_DEVICE *scard, IRP* irp, size_t inlen, BOOL
poslen2 = Stream_GetPosition(irp->output); poslen2 = Stream_GetPosition(irp->output);
Stream_Write_UINT32(irp->output, readerLen); Stream_Write_UINT32(irp->output, readerLen);
dataLength = smartcard_output_string(irp, readerName, wide); if (readerName)
dataLength += smartcard_output_string(irp, readerName, wide);
dataLength += smartcard_output_string(irp, "\0", wide); dataLength += smartcard_output_string(irp, "\0", wide);
smartcard_output_repos(irp, dataLength); smartcard_output_repos(irp, dataLength);
@ -1536,6 +1540,9 @@ finish:
#endif #endif
} }
if (pbAtr)
free(pbAtr);
return status; return status;
} }
@ -1549,6 +1556,7 @@ static UINT32 handle_Transmit(SMARTCARD_DEVICE* scard, IRP* irp, size_t inlen)
UINT32 ptrIoRecvPciBuffer; UINT32 ptrIoRecvPciBuffer;
UINT32 recvBufferIsNULL; UINT32 recvBufferIsNULL;
UINT32 linkedLen; UINT32 linkedLen;
void *tmp;
union union
{ {
SCARD_IO_REQUEST *rq; SCARD_IO_REQUEST *rq;
@ -1556,10 +1564,13 @@ static UINT32 handle_Transmit(SMARTCARD_DEVICE* scard, IRP* irp, size_t inlen)
void *v; void *v;
} ioSendPci, ioRecvPci; } ioSendPci, ioRecvPci;
SCARD_IO_REQUEST *pPioRecvPci; SCARD_IO_REQUEST *pPioRecvPci = NULL;
DWORD cbSendLength = 0, cbRecvLength = 0; DWORD cbSendLength = 0, cbRecvLength = 0;
BYTE *sendBuf = NULL, *recvBuf = NULL; BYTE *sendBuf = NULL, *recvBuf = NULL;
ioSendPci.v = NULL;
ioRecvPci.v = NULL;
status = handle_CommonTypeHeader(scard, irp, &inlen); status = handle_CommonTypeHeader(scard, irp, &inlen);
if (status) if (status)
goto finish; goto finish;
@ -1627,7 +1638,11 @@ static UINT32 handle_Transmit(SMARTCARD_DEVICE* scard, IRP* irp, size_t inlen)
status = SCARD_F_INTERNAL_ERROR; status = SCARD_F_INTERNAL_ERROR;
goto finish; goto finish;
} }
ioSendPci.v = realloc(ioSendPci.v, ioSendPci.rq->cbPciLength); tmp = realloc(ioSendPci.v, ioSendPci.rq->cbPciLength);
if (!tmp)
goto finish;
ioSendPci.v = tmp;
Stream_Read(irp->input, &ioSendPci.rq[1], linkedLen); Stream_Read(irp->input, &ioSendPci.rq[1], linkedLen);
} }
else else
@ -1696,7 +1711,11 @@ static UINT32 handle_Transmit(SMARTCARD_DEVICE* scard, IRP* irp, size_t inlen)
/* Read data, see /* Read data, see
* http://msdn.microsoft.com/en-us/library/windows/desktop/aa379807%28v=vs.85%29.aspx * http://msdn.microsoft.com/en-us/library/windows/desktop/aa379807%28v=vs.85%29.aspx
*/ */
ioRecvPci.v = realloc(ioRecvPci.v, ioRecvPci.rq->cbPciLength); tmp = realloc(ioRecvPci.v, ioRecvPci.rq->cbPciLength);
if (!tmp)
goto finish;
ioRecvPci.v = tmp;
Stream_Read(irp->input, &ioRecvPci.rq[1], linkedLen); Stream_Read(irp->input, &ioRecvPci.rq[1], linkedLen);
pPioRecvPci = ioRecvPci.rq; pPioRecvPci = ioRecvPci.rq;