[PATCH 6/6] xwayland/window-manager: Avoid doing work for unknown window

Rob Bradford robert.bradford at intel.com
Thu Jan 10 11:48:57 PST 2013


From: Rob Bradford <rob at linux.intel.com>

In particular if the hash table lookup fails and returns NULL then that value
would be passed into weston_wm_window_schedule_repaint which does not accept a
NULL value.
---
 src/xwayland/window-manager.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
index 303ef15..b6e8e79 100644
--- a/src/xwayland/window-manager.c
+++ b/src/xwayland/window-manager.c
@@ -800,8 +800,10 @@ weston_wm_handle_property_notify(struct weston_wm *wm, xcb_generic_event_t *even
 	struct weston_wm_window *window;
 
 	window = hash_table_lookup(wm->window_hash, property_notify->window);
-	if (window)
-		window->properties_dirty = 1;
+	if (!window)
+		return;
+
+	window->properties_dirty = 1;
 
 	weston_log("XCB_PROPERTY_NOTIFY: window %d, ",
 		property_notify->window);
-- 
1.7.11.7



More information about the wayland-devel mailing list