summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-12-15 10:06:15 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2021-12-15 10:38:12 +0100
commit88d68008b9979f7235ed225b70030a26e07ffcaf (patch)
tree727ba114d9131823367a6d9feaf943fa912c752d /kde-plasma/libksysguard/files
parentdev-ros/urdf: add := dep on urdfdom (diff)
downloadgentoo-88d68008b9979f7235ed225b70030a26e07ffcaf.tar.gz
gentoo-88d68008b9979f7235ed225b70030a26e07ffcaf.tar.bz2
gentoo-88d68008b9979f7235ed225b70030a26e07ffcaf.zip
kde-plasma/libksysguard: Fix segfault in process list tree view mode
Reported-by: Eric F. Garioud <eric-f.garioud@wanadoo.fr> Bug: https://bugs.gentoo.org/446534 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/libksysguard/files')
-rw-r--r--kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch76
1 files changed, 76 insertions, 0 deletions
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
new file mode 100644
index 000000000000..f37fbf60bf81
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.23.4-fix-segfault.patch
@@ -0,0 +1,76 @@
+From 311faef0ef0e5f60eebed2a5a00c43f5cb60aab1 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 7 Dec 2021 22:23:17 +0100
+Subject: [PATCH] Handle process parent changes in ProcessDataModel
+
+When the PPID of a process changes, it moves around in the model, changing the
+layout. This needs to be announced properly, otherwise users of the model get
+confused, leading to weird behaviour and crashes.
+
+The added code is pretty much a direct copy from ProcessModel.
+
+BUG: 446534
+
+
+(cherry picked from commit a0d70929a1b5e38bd8bf61e1895321124acf03a7)
+---
+ processcore/process_data_model.cpp | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/processcore/process_data_model.cpp b/processcore/process_data_model.cpp
+index 172ce7f..f776372 100644
+--- a/processcore/process_data_model.cpp
++++ b/processcore/process_data_model.cpp
+@@ -24,6 +24,8 @@ public:
+ Private(ProcessDataModel *q);
+ void beginInsertRow(KSysGuard::Process *parent);
+ void endInsertRow();
++ void beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent);
++ void endMoveProcess();
+ void beginRemoveRow(KSysGuard::Process *process);
+ void endRemoveRow();
+
+@@ -65,6 +67,12 @@ ProcessDataModel::Private::Private(ProcessDataModel *_q)
+ connect(m_processes.get(), &KSysGuard::Processes::endAddProcess, q, [this]() {
+ endInsertRow();
+ });
++ connect(m_processes.get(), &KSysGuard::Processes::beginMoveProcess, q, [this](KSysGuard::Process *process, KSysGuard::Process *new_parent) {
++ beginMoveProcess(process, new_parent);
++ });
++ connect(m_processes.get(), &KSysGuard::Processes::endMoveProcess, q, [this]() {
++ endMoveProcess();
++ });
+ connect(m_processes.get(), &KSysGuard::Processes::beginRemoveProcess, q, [this](KSysGuard::Process *process) {
+ beginRemoveRow(process);
+ });
+@@ -335,6 +343,27 @@ void ProcessDataModel::Private::endRemoveRow()
+ q->endRemoveRows();
+ }
+
++void ProcessDataModel::Private::beginMoveProcess(KSysGuard::Process *process, KSysGuard::Process *new_parent)
++{
++ if (m_flatList)
++ return; // We don't need to move processes when in simple mode
++
++ int current_row = process->parent()->children().indexOf(process);
++ Q_ASSERT(current_row != -1);
++ int new_row = new_parent->children().count();
++ QModelIndex sourceParent = getQModelIndex(process->parent(), 0);
++ QModelIndex destinationParent = getQModelIndex(new_parent, 0);
++ q->beginMoveRows(sourceParent, current_row, current_row, destinationParent, new_row);
++}
++
++void ProcessDataModel::Private::endMoveProcess()
++{
++ if (m_flatList)
++ return; // We don't need to move processes when in simple mode
++
++ q->endMoveRows();
++}
++
+ void ProcessDataModel::Private::update()
+ {
+ Processes::UpdateFlags flags;
+--
+GitLab
+