empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't corrupt memory when trying to GC various items on exit

Browse source
This commit is contained in:
Ilari Liusvaara 2014-05-19 12:43:04 +03:00
parent 7834906157
commit 7fb5407541
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/library/gc.cpp
View file

@ -5,18 +5,19 @@
namespace
{
std::set<garbage_collectable*> gc_items;
std::set<garbage_collectable*>* gc_items;
}
garbage_collectable::garbage_collectable()
{
gc_items.insert(this);
if(!gc_items) gc_items = new std::set<garbage_collectable*>;
gc_items->insert(this);
root_count = 1;
}
garbage_collectable::~garbage_collectable()
{
gc_items.erase(this);
gc_items->erase(this);
}
void garbage_collectable::mark_root()
@ -31,14 +32,15 @@ void garbage_collectable::unmark_root()
void garbage_collectable::do_gc()
{
for(auto i : gc_items)
if(!gc_items) return;
for(auto i : *gc_items)
i->reachable = false;
for(auto i : gc_items) {
for(auto i : *gc_items) {
if(i->root_count) {
i->mark();
}
}
for(auto i = gc_items.begin(); i != gc_items.end();) {
for(auto i = gc_items->begin(); i != gc_items->end();) {
if(!(*i)->reachable) {
auto ptr = i;
i++;