From c35327b02a28a83536450a664326d183662e89e1 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 21 Feb 2022 20:31:39 +0200 Subject: homescreenhandler: Avoid passing an invalid appid If there's no item added in the QList we'll return an invalid value pointing to some invalid memory, which we can not determine if its empty string or not, so this makes sure we check the list itself. Found when looking at removal/activation of surfaces while re-doing some parts in the compositor. Bug-AGL: SPEC-4263 Signed-off-by: Marius Vlad Change-Id: I912aa5a42a7d21374a389a7f193979f30504a83b --- homescreen/src/homescreenhandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 5ed1fab..c44cbb9 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -126,6 +126,7 @@ void HomescreenHandler::appTerminated(const QString& application_id) HMI_DEBUG("HomeScreen", "Application %s terminated, activating last app", application_id.toStdString().c_str()); if (apps_stack.contains(application_id)) { apps_stack.removeOne(application_id); - appStarted(apps_stack.last()); + if (!apps_stack.isEmpty()) + appStarted(apps_stack.last()); } } -- cgit 1.2.3-korg