luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid a segfault on exit

This commit is contained in:
Matthias Koefferlein 2022-07-18 00:16:56 +02:00
parent 6ba372f1a9
commit 24e8db996c
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/tl/tl/tlVariant.cc
View File

@ -254,42 +254,47 @@ void VariantUserClassBase::register_instance (const tl::VariantUserClassBase *in
void VariantUserClassBase::unregister_instance (const tl::VariantUserClassBase *inst, const std::type_info &type, bool is_const) void VariantUserClassBase::unregister_instance (const tl::VariantUserClassBase *inst, const std::type_info &type, bool is_const)
{ {
if (sp_class_table) { if (sp_class_table) {
auto c = sp_class_table->find (VariantUserClassTableKey (type, is_const)); auto c = sp_class_table->find (VariantUserClassTableKey (type, is_const));
if (c != sp_class_table->end ()) { if (c != sp_class_table->end ()) {
sp_class_table->erase (c); sp_class_table->erase (c);
sp_classes->operator[] (c->second) = 0; if (sp_classes) {
while (!sp_classes->empty () && sp_classes->back () == 0) { sp_classes->operator[] (c->second) = 0;
sp_classes->pop_back (); while (!sp_classes->empty () && sp_classes->back () == 0) {
sp_classes->pop_back ();
}
} }
} }
}
if (sp_class_index_by_name) {
auto cn = sp_class_index_by_name->find (std::make_pair (std::string (type.name ()), is_const)); auto cn = sp_class_index_by_name->find (std::make_pair (std::string (type.name ()), is_const));
if (cn != sp_class_index_by_name->end ()) { if (cn != sp_class_index_by_name->end ()) {
sp_class_index_by_name->erase (cn); sp_class_index_by_name->erase (cn);
} }
}
if (sp_class_to_index) {
sp_class_to_index->erase (inst); sp_class_to_index->erase (inst);
}
if (sp_class_table->empty ()) { if (sp_class_table && sp_class_table->empty ()) {
delete sp_class_table; delete sp_class_table;
sp_class_table = 0; sp_class_table = 0;
} }
if (sp_classes->empty ()) { if (sp_classes && sp_classes->empty ()) {
delete sp_classes; delete sp_classes;
sp_classes = 0; sp_classes = 0;
} }
if (sp_class_index_by_name->empty ()) { if (sp_class_index_by_name && sp_class_index_by_name->empty ()) {
delete sp_class_index_by_name; delete sp_class_index_by_name;
sp_class_index_by_name = 0; sp_class_index_by_name = 0;
} }
if (sp_class_to_index->empty ()) { if (sp_class_to_index && sp_class_to_index->empty ()) {
delete sp_class_to_index; delete sp_class_to_index;
sp_class_to_index = 0; sp_class_to_index = 0;
}
} }
} }