From 613aeb79c5604093f53e425fff6697195cb53171 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 14 Jan 2019 16:07:45 +0000 Subject: [PATCH] Guard resource deletion in OuptutConfiguration::sendApplied Summary: A client (kscreen-doctor especially) can disconnect whilst kwin still has an instance. Test Plan: Had reproducible crash on kscreen-doctor. Now don't. Reviewers: #kwin Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D18248 --- src/wayland/server/outputconfiguration_interface.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/wayland/server/outputconfiguration_interface.cpp b/src/wayland/server/outputconfiguration_interface.cpp index 738a15e5f6..25b6b465d3 100644 --- a/src/wayland/server/outputconfiguration_interface.cpp +++ b/src/wayland/server/outputconfiguration_interface.cpp @@ -287,6 +287,9 @@ void OutputConfigurationInterface::setApplied() void OutputConfigurationInterface::Private::sendApplied() { + if (!resource) { + return; + } org_kde_kwin_outputconfiguration_send_applied(resource); } @@ -299,6 +302,9 @@ void OutputConfigurationInterface::setFailed() void OutputConfigurationInterface::Private::sendFailed() { + if (!resource) { + return; + } org_kde_kwin_outputconfiguration_send_failed(resource); }