pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-07 08:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client: x11: fix a crash caused by a call to a destroyed window.

Browse Source 
Happens when a focused window is destroyed without a focus out event,
and a focus-in event occurs on another window.
This commit is contained in:
Yonit Halperin 2010-04-01 12:11:44 +03:00 committed by Izik Eidus
parent 4a208b3644
commit 6f40c593e9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/x11/red_window.cpp
View File

@ -1051,11 +1051,17 @@ RedWindow_p::RedWindow_p()
{
}
void RedWindow_p::destroy(PixelsSource_p& pix_source)
void RedWindow_p::destroy(RedWindow& red_window, PixelsSource_p& pix_source)
{
if (_win == None) {
return;
}
if (focus_window == &red_window) {
focus_window = NULL;
red_window.on_focus_out();
}
XPlatform::cleare_win_proc(_win);
XSelectInput(x_display, _win, 0);
XSync(x_display, False);
@ -1163,7 +1169,7 @@ void RedWindow_p::migrate(RedWindow& red_window, PixelsSource_p& pix_source, int
}
XTextProperty text_pro;
bool valid_title = XGetWMName(x_display, _win, &text_pro) && text_pro.value;
destroy(pix_source);
destroy(red_window, pix_source);
create(red_window, pix_source, _show_pos.x, _show_pos.y, attrib.width, attrib.height,
to_screen);
if (valid_title) {
@ -1227,7 +1233,7 @@ RedWindow::RedWindow(RedWindow::Listener& listener, int screen)
RedWindow::~RedWindow()
{
destroy(*(PixelsSource_p*)get_opaque());
destroy(*this, *(PixelsSource_p*)get_opaque());
if (_local_cursor) {
_local_cursor->unref();
}

2
client/x11/red_window_p.h
View File

@ -36,7 +36,7 @@ public:
void migrate(RedWindow& red_window, PixelsSource_p& pix_source, int dest_screen);
void create(RedWindow& red_window, PixelsSource_p& pix_source, int x, int y,
unsigned int width, unsigned int height, int in_screen);
void destroy(PixelsSource_p& pix_source);
void destroy(RedWindow& red_window, PixelsSource_p& pix_source);
void set_minmax(PixelsSource_p& pix_source, int width, int height);
void wait_for_reparent();
void wait_for_map();