frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Warn about too large Windows -> X clipboard pastes 

XChangeProperty() requests larger than the ~16MB permitted even with
BigReq will fail BadLength
This commit is contained in:
Jon Turney 2015-11-19 18:06:28 +00:00
parent 56a91f2067
commit d7010cd93a
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/xwin/winclipboard/xevents.c
View File

@ -690,6 +690,24 @@ winClipboardFlushXEvents(HWND hwnd,
free(pszConvertData); free(pszConvertData);
pszConvertData = NULL; pszConvertData = NULL;
/* data will fit into a single X request (INCR not yet supported) */
{
long unsigned int maxreqsize = XExtendedMaxRequestSize(pDisplay);
if (maxreqsize == 0)
maxreqsize = XMaxRequestSize(pDisplay);
/* covert to bytes and allow for allow for X_ChangeProperty request */
maxreqsize = maxreqsize*4 - 24;
if (xtpText.nitems > maxreqsize) {
ErrorF("winClipboardFlushXEvents - clipboard data size %lu greater than maximum %lu\n", xtpText.nitems, maxreqsize);
/* Abort */
fAbort = TRUE;
goto winClipboardFlushXEvents_SelectionRequest_Done;
}
}
/* Copy the clipboard text to the requesting window */ /* Copy the clipboard text to the requesting window */
iReturn = XChangeProperty(pDisplay, iReturn = XChangeProperty(pDisplay,
event.xselectionrequest.requestor, event.xselectionrequest.requestor,