[PATCH weston 1/2] wayland-client: Avoid null dereference when handling deletion

Rob Bradford robert.bradford at intel.com
Thu Mar 28 11:48:08 PDT 2013


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

If an unknown id is deleted then the lookup in the map will return NULL and
so we should avoid dereferencing that.
---
 src/wayland-client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 0873835..e8d3240 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -415,7 +415,7 @@ display_handle_delete_id(void *data, struct wl_display *display, uint32_t id)
 	pthread_mutex_lock(&display->mutex);
 
 	proxy = wl_map_lookup(&display->objects, id);
-	if (proxy != WL_ZOMBIE_OBJECT)
+	if (proxy && proxy != WL_ZOMBIE_OBJECT)
 		proxy->flags |= WL_PROXY_FLAG_ID_DELETED;
 	else
 		wl_map_remove(&display->objects, id);
-- 
1.8.1.2



More information about the wayland-devel mailing list