Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in generic wxDataViewCtrl::AssociateModel(NULL).

Browse Source 
Don't use the possibly dangling pointer.

Closes #16249.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-10 16:15:52 +00:00
parent d53f93f607
commit 021bd17d49
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/datavgen.cpp
View File

@@ -4797,9 +4797,12 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
m_notifier = new wxGenericDataViewModelNotifier( m_clientArea ); m_notifier = new wxGenericDataViewModelNotifier( m_clientArea );
model->AddNotifier( m_notifier ); model->AddNotifier( m_notifier );
} }
else if (m_notifier) else
{ {
m_notifier->Cleared(); // Our previous notifier has either been already deleted when the
// previous model was DecRef()'d in the base class AssociateModel() or
// is not associated with us any more because if the model is still
// alive, it's not used by this control.
m_notifier = NULL; m_notifier = NULL;
} }