blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

subsurface: handle NULL parent in get_root_surface

This commit is contained in:
Isaac Freund 2020-12-13 16:07:31 +01:00 committed by Simon Ser
parent ad4dae0844
commit f6fc4c2883
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wlr/types/wlr_surface.h
View File

@ -220,7 +220,8 @@ struct wlr_subsurface *wlr_subsurface_create(struct wlr_surface *surface,
struct wl_list *resource_list); struct wl_list *resource_list);
/** /**
* Get the root of the subsurface tree for this surface. * Get the root of the subsurface tree for this surface. Can return NULL if
* a surface in the tree has been destroyed.
*/ */
struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface); struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface);

3
types/wlr_surface.c
View File

@ -1061,6 +1061,9 @@ struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface) {
if (subsurface == NULL) { if (subsurface == NULL) {
break; break;
} }
if (subsurface->parent == NULL) {
return NULL;
}
surface = subsurface->parent; surface = subsurface->parent;
} }
return surface; return surface;