1
0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 11:47:24 +01:00

* CompilerDriver_pix_run.cpp (CompilerDriver_pix::run):

fixed #1296 "crash in fwb_pix".
This commit is contained in:
Vadim Kurland 2010-03-04 07:14:12 +00:00
parent 4569d2a390
commit 75a233826e
3 changed files with 13 additions and 2 deletions

View File

@ -1 +1 @@
#define BUILD_NUM 2654
#define BUILD_NUM 2655

View File

@ -1,3 +1,14 @@
2010-03-03 glitch.vk.crocodile.org <vadim@vk.crocodile.org>
* CompilerDriver_pix_run.cpp (CompilerDriver_pix::run):
fixed #1296 "crash in fwb_pix". Compiler used to create copy of
each network zone object, expanded it recursively and added
network and address objects to the newly created group
directly (rather than via references). This created objects that
were referenced by two parents in the tree which caused crash in
FWObject::destroyChildren() because an attempt to free the same
block of memory twice.
2010-03-03 vadim <vadim@vk.crocodile.org>
* compiler_lib/CompilerDriver.cpp (CompilerDriver::commonChecks2):

View File

@ -401,7 +401,7 @@ QString CompilerDriver_pix::run(const std::string &cluster_id,
for (list<FWObject*>::iterator j=ol.begin(); j!=ol.end(); ++j)
{
netzone_objects.insert( pair<string,FWObject*>(iface->getLabel(),*j));
nz->add(*j);
nz->addRef(*j);
}
iface->setStr("orig_netzone_id", netzone_id );
iface->setStr("network_zone",