github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed missing boundary checks in smartcard_array_dump

Browse Source
This commit is contained in:
Armin Novak 2020-03-02 09:01:39 +01:00
parent 451c4ddee6
commit 2968e41409
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
channels/smartcard/client/smartcard_pack.c
View File

@ -398,21 +398,35 @@ static char* smartcard_array_dump(const void* pd, size_t len, char* buffer, size
int rc; int rc;
char* start = buffer; char* start = buffer;
/* Ensure '\0' termination */
if (bufferLen > 0)
{
buffer[bufferLen - 1] = '\0';
bufferLen--;
}
rc = _snprintf(buffer, bufferLen, "{ "); rc = _snprintf(buffer, bufferLen, "{ ");
if ((rc < 0) || ((size_t)rc > bufferLen))
goto fail;
buffer += rc; buffer += rc;
bufferLen -= (size_t)rc; bufferLen -= (size_t)rc;
for (x = 0; x < len; x++) for (x = 0; x < len; x++)
{ {
rc = _snprintf(buffer, bufferLen, "%02X", data[x]); rc = _snprintf(buffer, bufferLen, "%02X", data[x]);
if ((rc < 0) || ((size_t)rc > bufferLen))
goto fail;
buffer += rc; buffer += rc;
bufferLen -= (size_t)rc; bufferLen -= (size_t)rc;
} }
rc = _snprintf(buffer, bufferLen, " }"); rc = _snprintf(buffer, bufferLen, " }");
if ((rc < 0) || ((size_t)rc > bufferLen))
goto fail;
buffer += rc; buffer += rc;
bufferLen -= (size_t)rc; bufferLen -= (size_t)rc;
fail:
return start; return start;
} }
static void smartcard_log_redir_handle(const char* tag, const REDIR_SCARDHANDLE* pHandle) static void smartcard_log_redir_handle(const char* tag, const REDIR_SCARDHANDLE* pHandle)