Applied patch [ 1121371 ] configtool NULL pointer accesses
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
84aa68c427
commit
510c9b78e3
@ -548,8 +548,11 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
|
|||||||
/// Clear dependencies
|
/// Clear dependencies
|
||||||
void ctConfigToolDoc::ClearDependencies(ctConfigItem* item)
|
void ctConfigToolDoc::ClearDependencies(ctConfigItem* item)
|
||||||
{
|
{
|
||||||
if (!item)
|
if (!item) {
|
||||||
item = GetTopItem();
|
item = GetTopItem();
|
||||||
|
if (!item)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
item->GetDependents().Clear();
|
item->GetDependents().Clear();
|
||||||
for ( wxObjectList::compatibility_iterator node = item->GetChildren().GetFirst(); node; node = node->GetNext() )
|
for ( wxObjectList::compatibility_iterator node = item->GetChildren().GetFirst(); node; node = node->GetNext() )
|
||||||
@ -569,6 +572,9 @@ void ctConfigToolDoc::RefreshDependencies()
|
|||||||
/// Refresh dependencies
|
/// Refresh dependencies
|
||||||
void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
|
void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
|
||||||
{
|
{
|
||||||
|
if (item==NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
wxArrayString requiresArr;
|
wxArrayString requiresArr;
|
||||||
wxString requires = item->GetPropertyString(wxT("requires"));
|
wxString requires = item->GetPropertyString(wxT("requires"));
|
||||||
wxString precludes = item->GetPropertyString(wxT("precludes"));
|
wxString precludes = item->GetPropertyString(wxT("precludes"));
|
||||||
|
Loading…
Reference in New Issue
Block a user