system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-03 02:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop-shell: Avoid NULL output dereference when getting surface label

Browse source 
When hotunplugging a display, the compositor will tear down the
corresponding output object.

Avoid NULL output dereferences by all surface label getters in
desktop-shell when hotunplugging happens.

Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
This commit is contained in:
Miguel A. Vico 2019-09-25 11:23:13 -07:00
parent 1ca4ed2015
commit 620f68dc4f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop-shell/shell.c
View file

@ -521,7 +521,7 @@ static int
focus_surface_get_label(struct weston_surface *surface, char *buf, size_t len)
{
return snprintf(buf, len, "focus highlight effect for output %s",
surface->output->name);
(surface->output ? surface->output->name : "NULL"));
}
/* no-op func for checking focus surface */
@ -2985,7 +2985,7 @@ static int
background_get_label(struct weston_surface *surface, char *buf, size_t len)
{
return snprintf(buf, len, "background for output %s",
surface->output->name);
(surface->output ? surface->output->name : "NULL"));
}
static void
@ -3065,7 +3065,7 @@ static int
panel_get_label(struct weston_surface *surface, char *buf, size_t len)
{
return snprintf(buf, len, "panel for output %s",
surface->output->name);
(surface->output ? surface->output->name : "NULL"));
}
static void