Skip to content
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

Make sure we know when deleting an emitting object #35423

Merged
merged 1 commit into from
Jan 22, 2020
Merged

Make sure we know when deleting an emitting object #35423

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
15 changes: 8 additions & 7 deletions core/object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,9 +1213,9 @@ Error Object::emit_signal(const StringName &p_name, const Variant **p_args, int
MessageQueue::get_singleton()->push_call(target->get_instance_id(), c.method, args, argc, true);
} else {
Variant::CallError ce;
s->lock++;
_emitting = true;
target->call(c.method, args, argc, ce);
s->lock--;
_emitting = false;

if (ce.error != Variant::CallError::CALL_OK) {
#ifdef DEBUG_ENABLED
Expand Down Expand Up @@ -1920,6 +1920,7 @@ Object::Object() {
_instance_id = ObjectDB::add_instance(this);
_can_translate = true;
_is_queued_for_deletion = false;
_emitting = false;
instance_binding_count = 0;
memset(_script_instance_bindings, 0, sizeof(void *) * MAX_SCRIPT_INSTANCE_BINDINGS);
script_instance = NULL;
Expand All @@ -1942,15 +1943,15 @@ Object::~Object() {

const StringName *S = NULL;

if (_emitting) {
//@todo this may need to actually reach the debugger prioritarily somehow because it may crash before
ERR_PRINTS("Object " + to_string() + " was freed or unreferenced while a signal is being emitted from it. Try connecting to the signal using 'CONNECT_DEFERRED' flag, or use queue_free() to free the object (if this object is a Node) to avoid this error and potential crashes.");
}

while ((S = signal_map.next(NULL))) {

Signal *s = &signal_map[*S];

if (s->lock > 0) {
//@todo this may need to actually reach the debugger prioritarily somehow because it may crash before
ERR_PRINTS("Object was freed or unreferenced while signal '" + String(*S) + "' is being emitted from it. Try connecting to the signal using 'CONNECT_DEFERRED' flag, or use queue_free() to free the object (if this object is a Node) to avoid this error and potential crashes.");
}

//brute force disconnect for performance
int slot_count = s->slot_map.size();
const VMap<Signal::Target, Signal::Slot>::Pair *slot_list = s->slot_map.get_array();
Expand Down
4 changes: 2 additions & 2 deletions core/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,7 @@ class Object {

MethodInfo user;
VMap<Target, Slot> slot_map;
int lock;
Signal() { lock = 0; }
Signal() {}
};

HashMap<StringName, Signal> signal_map;
Expand All @@ -481,6 +480,7 @@ class Object {
bool _predelete();
void _postinitialize();
bool _can_translate;
bool _emitting;
#ifdef TOOLS_ENABLED
bool _edited;
uint32_t _edited_version;
Expand Down