From 76fa1b83638310c23bf3ca952e4479499b8ecb43 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 12 Dec 2022 21:02:19 +0200 Subject: [PATCH] src: Verify if the output is present The output destroy handler will invalidate the weston output and with it we're no longer have access to it when the shell client closes up. This checks against the weston output to avoid an illegal memory access. Still part of the hot-plug connector fixes. Bug-AGL: SPEC-4625 Signed-off-by: Marius Vlad Reported-by: Detlev Casanova Change-Id: Ic4c389422057fa082aff7fdbbc13af0c16f7bbb6 --- src/desktop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/desktop.c b/src/desktop.c index dfcc24d..0f1da18 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -289,8 +289,9 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) * the DESKTOP role can happen here as well, because we can fall-back * to that when we try to determine the role type. Application that * do not set the app_id will be land here, when destroyed */ - if (output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE || - surface->role == IVI_SURFACE_ROLE_DESKTOP)) + if ((output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE || + surface->role == IVI_SURFACE_ROLE_DESKTOP)) || + output->output == NULL) goto skip_output_asignment; assert(output != NULL); @@ -366,7 +367,7 @@ skip_output_asignment: weston_log("Removed surface %p, app_id %s, role %s\n", surface, app_id, ivi_layout_get_surface_role_name(surface)); - if (app_id && output) { + if (app_id && output && output->output) { shell_advertise_app_state(output->ivi, app_id, NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED); if (output->ivi->shell_client.ready) -- 2.16.6