osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix memory leaks in Expert Info dialog 

Models and children weren't deleted which leaked memory all over the place.

Change-Id: I961016b2501ad8cc8c75cf5fa5b0c86756a29382
Reviewed-on: https://code.wireshark.org/review/24858
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2017-12-16 10:03:55 -05:00
parent 68668b785c
commit 0b88544b07
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/expert_info_dialog.cpp
View File

@ -127,6 +127,8 @@ ExpertInfoDialog::ExpertInfoDialog(QWidget &parent, CaptureFile &capture_file) :
ExpertInfoDialog::~ExpertInfoDialog()
{
delete ui;
delete proxyModel_;
delete expert_info_model_;
}
void ExpertInfoDialog::clearAllData()

11
ui/qt/models/expert_info_model.cpp
View File

@ -29,6 +29,12 @@ ExpertPacketItem::ExpertPacketItem(expert_info_t& expert_info, column_info *cinf
ExpertPacketItem::~ExpertPacketItem()
{
for (int row = 0; row < childItems_.count(); row++)
{
delete childItems_.value(row);
}
childItems_.clear();
}
QString ExpertPacketItem::groupKey(bool group_by_summary, int severity, int group, QString protocol, int expert_hf)
@ -92,6 +98,11 @@ ExpertInfoModel::ExpertInfoModel(CaptureFile& capture_file, QObject *parent) :
{
}
ExpertInfoModel::~ExpertInfoModel()
{
delete root_;
}
void ExpertInfoModel::clear()
{
emit beginResetModel();

1
ui/qt/models/expert_info_model.h
View File

@ -68,6 +68,7 @@ class ExpertInfoModel : public QAbstractItemModel
public:
ExpertInfoModel(CaptureFile& capture_file, QObject *parent = 0);
virtual ~ExpertInfoModel();
enum ExpertColumn {
colSeverity = 0,