From 193775def6a044cc105cd395fc687aea0ae0c341 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Mon, 13 May 2019 23:51:24 +0200 Subject: [PATCH] FrameSvg: prevent crash when calling mask() with no frame yet created Reviewers: #plasma, apol Reviewed By: apol Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D21200 --- src/plasma/framesvg.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plasma/framesvg.cpp b/src/plasma/framesvg.cpp index cf1bc0034..b53bee0cd 100644 --- a/src/plasma/framesvg.cpp +++ b/src/plasma/framesvg.cpp @@ -298,10 +298,14 @@ QPixmap FrameSvg::alphaMask() const QRegion FrameSvg::mask() const { + QRegion result; + if (!d->frame) { + return result; + } + QString id = d->cacheId(d->frame.data(), QString()); QRegion* obj = d->frame->cachedMasks.object(id); - QRegion result; if (!obj) { obj = new QRegion(QBitmap(d->alphaMask().mask()));