onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 04:07:55 +01:00
Code Issues Releases Wiki Activity

see #2242 fix crash when ASA import was attempted into locked library

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-19 19:15:39 -07:00
parent 33bfd16c82
commit 07fb9a3bfc
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libgui/importFirewallConfigurationWizard/IC_NetworkZonesPage.cpp
View File

@ -112,6 +112,8 @@ void IC_NetworkZonesPage::setNetworkZones()
Firewall *fw =
dynamic_cast<ImportFirewallConfigurationWizard*>(wizard())->getFirewall();
if (fw == NULL) return;
// read and configure network zones
list<FWObject*> all_interfaces = fw->getByTypeDeep(Interface::TYPENAME);
list<FWObject*>::iterator it;

7
src/libgui/importFirewallConfigurationWizard/IC_ProgressPage.cpp
View File

@ -86,7 +86,12 @@ int IC_ProgressPage::nextId () const
dynamic_cast<ImportFirewallConfigurationWizard*>(wizard())->
getPlatform();
if (platform == "pix" || platform == "fwsm")
Firewall *fw =
dynamic_cast<ImportFirewallConfigurationWizard*>(wizard())->getFirewall();
// I can move on to the next page only if firewall object has been created
// and the next page only makes sense for pix and fwsm
if (fw && (platform == "pix" || platform == "fwsm"))
return ImportFirewallConfigurationWizard::Page_NetworkZones;
return -1;