From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 18 Nov 2020 13:54:39 +0000 (+0200)
Subject: layout: Do not attempt to activate surfaces that doesn't have a valid app_id
X-Git-Tag: 10.91.0^0
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=bdd8dd718496dc8e4330209c46c196442bcf7d3e;p=src%2Fagl-compositor.git

layout: Do not attempt to activate surfaces that doesn't have a valid app_id

Observed when trying to activate (a previous one, as a result
of deactivation) a surface that didn't had an application id set.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I3c39ae7dfb237e53f4b2bad64e7bc5ef91a76f0c
---

diff --git a/src/layout.c b/src/layout.c
index 0345807..0363af7 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -745,6 +745,9 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
 	struct ivi_surface *surf;
 	struct ivi_compositor *ivi = output->ivi;
 
+	if (!app_id)
+		return;
+
 	surf = ivi_find_app(ivi, app_id);
 	if (!surf)
 		return;
@@ -798,6 +801,9 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 	struct ivi_output *ivi_output;
 	struct ivi_policy *policy = ivi->policy;
 
+	if (!app_id)
+		return;
+
 	surf = ivi_find_app(ivi, app_id);
 	if (!surf)
 		return;