Skip to content

Crash fix after diff and closing a model #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rkhaotix merged 1 commit into from
Mar 13, 2026
Merged

Crash fix after diff and closing a model #2061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion libs/libcore/src/baseobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1630,7 +1630,11 @@ void BaseObject::clearDependencies()

void BaseObject::clearReferences()
{
for(auto &obj : object_refs)
/* Iterate over a snapshot: unsetDependency calls back into this->unsetReference
* which erases from object_refs, invalidating the range-for iterator. */
auto refs_snapshot = object_refs;

for(auto &obj : refs_snapshot)
obj->unsetDependency(this);

object_refs.clear();
Expand Down
14 changes: 13 additions & 1 deletion libs/libcore/src/databasemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,10 +836,22 @@ void DatabaseModel::destroyObjects()
ritr = objects.rbegin();
ritr_end = objects.rend();

/* Pass 1: clear all deps/refs across every object before any deletion.
* This prevents dangling pointers when Relationship::destroyObjects() later
* frees intermediate columns/constraints that are still referenced by other objects. */
while(ritr != ritr_end)
{
ritr->second->clearAllDepsRefs();
ritr++;
}

ritr = objects.rbegin();
ritr_end = objects.rend();

/* Pass 2: now safe to delete — no object can hold live pointers to another. */
while(ritr != ritr_end)
{
object = ritr->second;
object->clearAllDepsRefs();
ritr++;

// We ignore the database itself, permission objects (destroyed separetely) and table children objects
Expand Down