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

winex11.drv: Avoid race condition in X11 error handling. 

The err_callback* globals need to be protected from being overwritten
before X11DRV_check_error is called, otherwise no or the wrong error
handler might be called.

Signed-off-by: Torge Matthies <openglfreak@googlemail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 2e4bfa642e)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Torge Matthies 2021-06-07 01:05:16 +02:00 committed by Michael Stefaniuc
parent 3b224895b0
commit 96a1855bb9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/winex11.drv/x11drv_main.c
View File

@ -108,6 +108,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
}; };
static CRITICAL_SECTION x11drv_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CRITICAL_SECTION x11drv_section = { &critsect_debug, -1, 0, 0, 0, 0 };
static CRITICAL_SECTION x11drv_error_section;
static CRITICAL_SECTION_DEBUG x11drv_error_section_debug =
{
0, 0, &x11drv_error_section,
{ &x11drv_error_section_debug.ProcessLocksList, &x11drv_error_section_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": x11drv_error_section") }
};
static CRITICAL_SECTION x11drv_error_section = { &x11drv_error_section_debug, -1, 0, 0, 0, 0 };
struct d3dkmt_vidpn_source struct d3dkmt_vidpn_source
{ {
D3DKMT_VIDPNSOURCEOWNER_TYPE type; /* VidPN source owner type */ D3DKMT_VIDPNSOURCEOWNER_TYPE type; /* VidPN source owner type */
@ -256,6 +265,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event )
*/ */
void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg )
{ {
EnterCriticalSection( &x11drv_error_section );
err_callback = callback; err_callback = callback;
err_callback_display = display; err_callback_display = display;
err_callback_arg = arg; err_callback_arg = arg;
@ -272,8 +282,10 @@ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void
*/ */
int X11DRV_check_error(void) int X11DRV_check_error(void)
{ {
int res = err_callback_result;
err_callback = NULL; err_callback = NULL;
return err_callback_result; LeaveCriticalSection( &x11drv_error_section );
return res;
} }