ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Don't crash when getting an invalid window in SelectionRequest.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-08-17 17:23:31 +09:00
parent 0a1f9bec6d
commit 6da991c75b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/winex11.drv/clipboard.c
View File

@ -2298,6 +2298,11 @@ static int is_atom_error( Display *display, XErrorEvent *event, void *arg )
return (event->error_code == BadAtom); return (event->error_code == BadAtom);
} }
static int is_window_error( Display *display, XErrorEvent *event, void *arg )
{
return (event->error_code == BadWindow);
}
/************************************************************************** /**************************************************************************
* X11DRV_CLIPBOARD_InsertSelectionProperties * X11DRV_CLIPBOARD_InsertSelectionProperties
* *
@ -3439,6 +3444,8 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev
TRACE("\n"); TRACE("\n");
X11DRV_expect_error( display, is_window_error, NULL );
/* /*
* We can only handle the selection request if : * We can only handle the selection request if :
* The selection is PRIMARY or CLIPBOARD, AND we can successfully open the clipboard. * The selection is PRIMARY or CLIPBOARD, AND we can successfully open the clipboard.
@ -3527,6 +3534,8 @@ END:
TRACE("Sending SelectionNotify event...\n"); TRACE("Sending SelectionNotify event...\n");
XSendEvent(display,event->requestor,False,NoEventMask,(XEvent*)&result); XSendEvent(display,event->requestor,False,NoEventMask,(XEvent*)&result);
} }
XSync( display, False );
if (X11DRV_check_error()) WARN( "requestor %lx is no longer valid\n", event->requestor );
} }