Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix memory leak & crash.
crash happens on frequent new&delete browser objects:
QtTreePropertyBrowser* b = new QtTreePropertyBrowser();
...
delete b;
...
QtTreePropertyBrowser* b2 = new QtTreePropertyBrowser();
crashes if b2 == b, caused by leaked map to invalid QtAbstractEditorFactory pointer.
  • Loading branch information
crazii committed Aug 22, 2016
commit f6b8b7d4f5d5e08d93f723a8122103041bc9399b
21 changes: 21 additions & 0 deletions qtpropertybrowser/src/qtpropertybrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1732,6 +1732,27 @@ QtAbstractPropertyBrowser::QtAbstractPropertyBrowser(QWidget *parent)
*/
QtAbstractPropertyBrowser::~QtAbstractPropertyBrowser()
{
//perform clean ups
Map1::iterator mf = (*m_viewToManagerToFactory()).find(this);
if (mf != (*m_viewToManagerToFactory()).end())
{
for (Map1::mapped_type::iterator f = mf->begin(); f != mf->end(); ++f)
{
Map2::iterator fv = (*m_managerToFactoryToViews).find(f.key());
if (fv != (*m_managerToFactoryToViews).end())
{
Map2::mapped_type::iterator v = fv->find(*f);
v->removeAll(this);
if (v->empty())
fv->erase(v);

if (fv->empty())
(*m_managerToFactoryToViews).erase(fv);
}
}
(*m_viewToManagerToFactory()).erase(mf);
}

QList<QtBrowserItem *> indexes = topLevelItems();
QListIterator<QtBrowserItem *> itItem(indexes);
while (itItem.hasNext())
Expand Down