Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-22 23:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash on missing schema when loading rdb

Browse Source
This commit is contained in:
Thomas Krijnen
2025-09-29 11:29:52 +02:00
parent 91f371a46e
commit 06f5ded038
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcParse.cpp
+12 -6
View File
@@ -1381,11 +1381,13 @@ IfcFile::IfcFile(const std::string& path, filetype ty, bool readonly)
storage_.emplace<0>(); storage_.emplace<0>();
good_ = file_open_status::READ_ERROR; good_ = file_open_status::READ_ERROR;
} else { } else {
std::get<impl::rocks_db_file_storage>(storage_).read_schema(schema_); if (std::get<impl::rocks_db_file_storage>(storage_).read_schema(schema_)) {
byid_ = decltype(byid_)(&std::get<impl::rocks_db_file_storage>(storage_).instance_by_name_);
byid_ = decltype(byid_)(&std::get<impl::rocks_db_file_storage>(storage_).instance_by_name_); byref_excl_ = decltype(byref_excl_)(&std::get<impl::rocks_db_file_storage>(storage_).byref_excl_);
byref_excl_ = decltype(byref_excl_)(&std::get<impl::rocks_db_file_storage>(storage_).byref_excl_); byguid_ = decltype(byguid_)(&std::get<impl::rocks_db_file_storage>(storage_).byguid_);
byguid_ = decltype(byguid_)(&std::get<impl::rocks_db_file_storage>(storage_).byguid_); } else {
good_ = file_open_status::UNSUPPORTED_SCHEMA;
}
} }
// byidentity_ = decltype(byidentity_)(&std::get<impl::rocks_db_file_storage>(storage_).instance_cache_); // byidentity_ = decltype(byidentity_)(&std::get<impl::rocks_db_file_storage>(storage_).instance_cache_);
} else { } else {
@@ -2896,7 +2898,11 @@ bool IfcParse::impl::rocks_db_file_storage::read_schema(const IfcParse::schema_d
db->Get(rocksdb::ReadOptions{}, key, &value); db->Get(rocksdb::ReadOptions{}, key, &value);
std::vector<std::string> strings; std::vector<std::string> strings;
if (::impl::deserialize(this, value, strings) && strings.size() == 1) { if (::impl::deserialize(this, value, strings) && strings.size() == 1) {
schema = schema_by_name(strings[0]); try {
schema = schema_by_name(strings[0]);
} catch (IfcException&) {
return false;
}
return true; return true;
} }
#endif #endif