File 0004-generate-the-old-key-before-updating-enabl... of Package plasma-framework

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-generate-the-old-key-before-updating-enabledborders.patch of Package plasma-framework

From 6ffe068b80143ba92cae6eaddf1bcd42c5ff4bed Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 9 Jun 2017 16:02:46 +0200
Subject: generate the old key before updating enabledborders

Summary:
sometimes a frame changed enabled borders causing a dangling
pointer in s_sharedFrames, since oldkey was generated
with the new enabled borders, it generated a key not present
in the hash, tryed to remove it and left the one associated
with the old key in the hash.
if the need to reuse a frame with that key ever arised again,
we had a crash
BUG:378508

Test Plan:
couldn't reproduce the crash neither with or without patch,
with the patch, if i put debug in every place a framedata is removed,
searching if the key is in the hash before removing it, now
it's always true, before sometimes it was false

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel, #frameworks

Tags: #plasma, #frameworks

Differential Revision: https://phabricator.kde.org/D6162
---
 src/plasma/framesvg.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plasma/framesvg.cpp b/src/plasma/framesvg.cpp
index 67b5cae..488fa68 100644
--- a/src/plasma/framesvg.cpp
+++ b/src/plasma/framesvg.cpp
@@ -496,10 +496,9 @@ QPixmap FrameSvgPrivate::alphaMask()
             updateSizes(maskFrame);
         }
 
-       // maskFrame = frame;
+        const QString oldKey = cacheId(maskFrame, maskPrefix);
         maskFrame->enabledBorders = frame->enabledBorders;
         if (maskFrame->cachedBackground.isNull() || maskFrame->frameSize != frameSize(frame)) {
-            const QString oldKey = cacheId(maskFrame, maskPrefix);
             maskFrame->frameSize = frameSize(frame).toSize();
             const QString newKey = cacheId(maskFrame, maskPrefix);
             if (s_sharedFrames[q->theme()->d].contains(oldKey)) {
-- 
cgit v0.11.2

Places

File 0004-generate-the-old-key-before-updating-enabledborders.patch of Package plasma-framework

Places