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

[channels,cliprdr] fix cliprdr_packet_format_list_new

Browse Source 
* Fix length calculations
* Fix format name write, skip empty strings
This commit is contained in:
Armin Novak 2024-08-12 13:22:55 +02:00
parent 122c6eaeb9
commit 83b253dc84
No known key found for this signature in database
GPG Key ID: 2CF4A2D2D3D72105
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
channels/cliprdr/cliprdr_common.c
View File

@ -290,7 +290,7 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList,
{
wszFormatName = NULL;
if (szFormatName)
if (szFormatName && (strnlen(szFormatName, 2) > 0))
{
wszFormatName = ConvertUtf8ToWCharAlloc(szFormatName, &formatNameSize);
@ -299,9 +299,9 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList,
Stream_Free(s, TRUE);
return NULL;
}
formatNameSize += 1; /* append terminating '\0' */
}
formatNameSize++;
if (formatNameSize > 15)
formatNameSize = 15;
@ -325,12 +325,12 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList,
length += 4;
formatNameSize = sizeof(WCHAR);
if (format->formatName)
if (format->formatName && (strnlen(format->formatName, 2) > 0))
{
SSIZE_T size = ConvertUtf8ToWChar(format->formatName, NULL, 0);
if (size < 0)
return NULL;
formatNameSize = (size_t)(size + 1) * sizeof(WCHAR);
formatNameSize += (size_t)size * sizeof(WCHAR);
}
length += (UINT32)formatNameSize;
@ -349,7 +349,7 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList,
format = (CLIPRDR_FORMAT*)&(formatList->formats[index]);
Stream_Write_UINT32(s, format->formatId); /* formatId (4 bytes) */
if (format->formatName)
if (format->formatName && (strnlen(format->formatName, 2) > 0))
{
const size_t cap = Stream_Capacity(s);
const size_t pos = Stream_GetPosition(s);
@ -361,8 +361,7 @@ wStream* cliprdr_packet_format_list_new(const CLIPRDR_FORMAT_LIST* formatList,
}
const size_t len = strnlen(format->formatName, rem / sizeof(WCHAR));
if (Stream_Write_UTF16_String_From_UTF8(s, len + 1, format->formatName, len, TRUE) <
0)
if (Stream_Write_UTF16_String_From_UTF8(s, len, format->formatName, len, TRUE) < 0)
{
Stream_Free(s, TRUE);
return NULL;