[mutter/wip/carlosg/x11less-preparations: 14/18] x11: protect against null MetaX11Display when looking up X11 windows
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/x11less-preparations: 14/18] x11: protect against null MetaX11Display when looking up X11 windows
- Date: Mon, 25 Feb 2019 18:10:13 +0000 (UTC)
commit e1638e402f93af4d3a455340bd75400eb965065e
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Dec 10 14:33:40 2018 +0100
x11: protect against null MetaX11Display when looking up X11 windows
This may happen after MetaX11Display destruction, as mutter's POV of
the stack didn't catch up yet.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/420
src/x11/meta-x11-display.c | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index bc2752dae..cfbeccd2c 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -1551,6 +1551,8 @@ MetaWindow *
meta_x11_display_lookup_x_window (MetaX11Display *x11_display,
Window xwindow)
{
+ if (!x11_display)
+ return NULL;
return g_hash_table_lookup (x11_display->xids, &xwindow);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]