morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 08:24:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

[winpr,clipboard] follow up to #10901

Browse Source 
CF_UNICODETEXT is UCS-2 encoded, so determine string length with
_wscnlen, the other string types are in local encoding which requires
strnlen
This commit is contained in:
akallabeth
2024-12-03 11:39:49 +01:00
parent 4b35fe8cfa
commit be6c108189
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winpr/libwinpr/clipboard/clipboard.c
View File

@@ -492,7 +492,7 @@ BOOL ClipboardSetData(wClipboard* clipboard, UINT32 formatId, const void* data,
free(clipboard->data);
clipboard->data = calloc(size + 1, sizeof(char));
clipboard->data = calloc(size + sizeof(WCHAR), sizeof(char));
if (!clipboard->data)
return FALSE;
@@ -506,9 +506,11 @@ BOOL ClipboardSetData(wClipboard* clipboard, UINT32 formatId, const void* data,
{
case CF_TEXT:
case CF_OEMTEXT:
case CF_UNICODETEXT:
clipboard->size = strnlen(clipboard->data, size) + 1;
break;
case CF_UNICODETEXT:
clipboard->size = (_wcsnlen(clipboard->data, size / sizeof(WCHAR)) + 1) * sizeof(WCHAR);
break;
default:
clipboard->size = size;
break;