Skip to content

V
vlc-2-2
Commit bd341a98 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

XCB/window: fix potential use-after-free

parent 00f76ba2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
modules/video_output/xcb/window.c
View file @ bd341a98
...@@ -328,7 +328,10 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg) ...@@ -328,7 +328,10 @@ static int Open (vout_window_t *wnd, const vout_window_cfg_t *cfg)
* request from this thread must be completed at this point. */ * request from this thread must be completed at this point. */
if ((p_sys->keys != NULL) if ((p_sys->keys != NULL)
&& vlc_clone (&p_sys->thread, Thread, wnd, VLC_THREAD_PRIORITY_LOW)) && vlc_clone (&p_sys->thread, Thread, wnd, VLC_THREAD_PRIORITY_LOW))
{
XCB_keyHandler_Destroy (p_sys->keys); XCB_keyHandler_Destroy (p_sys->keys);
p_sys->keys = NULL;
}
xcb_flush (conn); /* Make sure map_window is sent (should be useless) */ xcb_flush (conn); /* Make sure map_window is sent (should be useless) */
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -595,7 +598,10 @@ static int EmOpen (vout_window_t *wnd, const vout_window_cfg_t *cfg) ...@@ -595,7 +598,10 @@ static int EmOpen (vout_window_t *wnd, const vout_window_cfg_t *cfg)
CacheAtoms (p_sys); CacheAtoms (p_sys);
if ((p_sys->keys != NULL) if ((p_sys->keys != NULL)
&& vlc_clone (&p_sys->thread, Thread, wnd, VLC_THREAD_PRIORITY_LOW)) && vlc_clone (&p_sys->thread, Thread, wnd, VLC_THREAD_PRIORITY_LOW))
{
XCB_keyHandler_Destroy (p_sys->keys); XCB_keyHandler_Destroy (p_sys->keys);
p_sys->keys = NULL;
}
xcb_flush (conn); xcb_flush (conn);
(void) cfg; (void) cfg;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment