From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org, howaboutsynergy@pm.me,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Subject: [PATCH 1/3] kernel-shark: Make KsEventsCheckBoxWidget::removeSystem more robust
Date: Tue, 23 Jul 2019 15:52:02 +0300 [thread overview]
Message-ID: <20190723125204.22799-2-y.karadz@gmail.com> (raw)
In-Reply-To: <20190723125204.22799-1-y.karadz@gmail.com>
The function has to be able to handle safely the case when the Checkbox
tree widget is empty or it does not contain the item to be removed.
Reported-by: howaboutsynergy <howaboutsynergy@pm.me>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204277
Fixes: 4a02481fff (Remove all system=ftrace events from Record dialog)
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark/src/KsWidgetsLib.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/kernel-shark/src/KsWidgetsLib.cpp b/kernel-shark/src/KsWidgetsLib.cpp
index 84afec9..330230e 100644
--- a/kernel-shark/src/KsWidgetsLib.cpp
+++ b/kernel-shark/src/KsWidgetsLib.cpp
@@ -749,10 +749,13 @@ QStringList KsEventsCheckBoxWidget::getCheckedEvents(bool option)
/** Remove a System from the Checkbox tree. */
void KsEventsCheckBoxWidget::removeSystem(QString name) {
- QTreeWidgetItem *item =
- _tree.findItems(name, Qt::MatchFixedString, 0)[0];
+ auto itemList = _tree.findItems(name, Qt::MatchFixedString, 0);
+ int index;
- int index = _tree.indexOfTopLevelItem(item);
+ if (itemList.isEmpty())
+ return;
+
+ index = _tree.indexOfTopLevelItem(itemList[0]);
if (index >= 0)
_tree.takeTopLevelItem(index);
}
--
2.20.1
next prev parent reply other threads:[~2019-07-23 12:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-23 12:52 [PATCH 0/3] Fixes needed befor KS 1.0 Yordan Karadzhov (VMware)
2019-07-23 12:52 ` Yordan Karadzhov (VMware) [this message]
2019-07-23 12:52 ` [PATCH 2/3] kernel-shark: Better error message for the constructor of KsCaptureControl Yordan Karadzhov (VMware)
2019-07-23 12:52 ` [PATCH 3/3] kernel-shark: Disable Capture if trace-cmd can't function Yordan Karadzhov (VMware)
2019-07-23 23:06 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190723125204.22799-2-y.karadz@gmail.com \
--to=y.karadz@gmail.com \
--cc=howaboutsynergy@pm.me \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).