mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4609 from akallabeth/clipboard_return_check 

Added proper return value checks for clipboard data.
This commit is contained in:
Martin Fleisz 2018-05-02 10:10:55 +02:00 committed by GitHub
parent 2dee696af0 a1c3c1ad64
commit c0804699f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/X11/xf_cliprdr.c
View File

@ -1422,6 +1422,14 @@ static UINT xf_cliprdr_server_format_data_response(CliprdrClientContext*
DstSize = 0;
pDstData = (BYTE*) ClipboardGetData(clipboard->system, dstFormatId, &DstSize);
if (!pDstData)
{
WLog_ERR(TAG, "failed to get clipboard data in format %s [source format %s]",
ClipboardGetFormatName(clipboard, dstFormatId),
ClipboardGetFormatName(clipboard, srcFormatId));
return ERROR_INTERNAL_ERROR;
}
if (nullTerminated)
{
while (DstSize > 0 && pDstData[DstSize - 1] == '\0')

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

@ -436,6 +436,7 @@ void* ClipboardGetData(wClipboard* clipboard, UINT32 formatId, UINT32* pSize)
if (!pSize)
return NULL;
*pSize = 0;
format = ClipboardFindFormat(clipboard, clipboard->formatId, NULL);
if (!format)