alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

When iterating a hash_map, be careful not to delete i->first

Browse source 
before doing ++i to avoid memory issues.

* src/tgba/taatgba.cc, src/tgba/taatgba.hh,
src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh: Fix them.
This commit is contained in:
Damien Lefortier 2010-01-20 17:37:25 +01:00
parent 0d6fd3225a
commit 04827ef4a1
5 changed files with 63 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/tgba/taatgba.cc
View file

@ -302,8 +302,13 @@ namespace spot
delete succ_[i]->dst;
delete succ_[i];
}
for (seen_map::iterator i = seen_.begin(); i != seen_.end(); ++i)
delete i->first;
for (seen_map::iterator i = seen_.begin(); i != seen_.end();)
{
// Advance the iterator before deleting the formula.
const spot::state_set* s = i->first;
++i;
delete s;
}
}
void
@ -350,6 +355,18 @@ namespace spot
| taa_tgba_string |
`----------------*/
taa_tgba_string::~taa_tgba_string()
{
ns_map::iterator i;
for (i = name_state_map_.begin(); i != name_state_map_.end(); ++i)
{
taa_tgba::state::iterator i2;
for (i2 = i->second->begin(); i2 != i->second->end(); ++i2)
delete *i2;
delete i->second;
}
}
std::string
taa_tgba_string::label_to_string(const label_t& label) const
{
@ -370,7 +387,16 @@ namespace spot
{
ns_map::iterator i;
for (i = name_state_map_.begin(); i != name_state_map_.end(); ++i)
i->first->destroy();
{
taa_tgba::state::iterator i2;
for (i2 = i->second->begin(); i2 != i->second->end(); ++i2)
delete *i2;
// Advance the iterator before deleting the formula.
const ltl::formula* s = i->first;
delete i->second;
++i;
s->destroy();
}
}
std::string