On Mar 28, 2013 2:29 PM, "Jonas Ådahl" <<a href="mailto:jadahl@gmail.com">jadahl@gmail.com</a>> wrote: > > On Thu, Mar 28, 2013 at 7:48 PM, Rob Bradford <<a href="mailto:robert.bradford@intel.com">robert.bradford@intel.com</a>> wrote: > > From: Rob Bradford <<a href="mailto:rob@linux.intel.com">rob@linux.intel.com</a>> > > > > If an unknown id is deleted then the lookup in the map will return NULL and > > so we should avoid dereferencing that. > > Hi Rob, > > I think the patch looks good, but I have one comment below. > > Thanks, > Jonas > > > --- > > 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; > > I believe this could only ever happen if the compositor is > malfunctioning, as the delete_id event is only sent once for every id > being deleted. If we would get NULL here, it would mean that it would > already have been deleted by the server and destroyed by the client > without having been reused again. > > Anyhow, I think it makes sense to avoid crashing when the server is > misbehaving, but would it maybe make sense to log a warning about it? Along those lines there is another one on line 737 in queue_event that we may want to look at. Again, this should only happen in the case of misbehaving compositors. --Jason Ekstrand. > > > else > > wl_map_remove(&display->objects, id); > > -- > > 1.8.1.2 > > > > _______________________________________________ > > wayland-devel mailing list > > <a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a> > > <a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a> > _______________________________________________ > wayland-devel mailing list > <a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a> > <a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a>