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

[3.x] Fix crash when creating thread #53060

Merged
merged 1 commit into from
Oct 3, 2021
Merged

[3.x] Fix crash when creating thread #53060

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
24 changes: 16 additions & 8 deletions core/bind/core_bind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2617,6 +2617,12 @@ void _Thread::_start_func(void *ud) {
Ref<_Thread> *tud = (Ref<_Thread> *)ud;
Ref<_Thread> t = *tud;
memdelete(tud);

Object *target_instance = ObjectDB::get_instance(t->target_instance_id);
if (!target_instance) {
ERR_FAIL_MSG(vformat("Could not call function '%s' on previously freed instance to start thread %s.", t->target_method, t->get_id()));
}

Variant::CallError ce;
const Variant *arg[1] = { &t->userdata };
int argc = 0;
Expand All @@ -2635,15 +2641,17 @@ void _Thread::_start_func(void *ud) {
// We must check if we are in case b).
int target_param_count = 0;
int target_default_arg_count = 0;
Ref<Script> script = t->target_instance->get_script();
Ref<Script> script = target_instance->get_script();
if (script.is_valid()) {
MethodInfo mi = script->get_method_info(t->target_method);
target_param_count = mi.arguments.size();
target_default_arg_count = mi.default_arguments.size();
} else {
MethodBind *method = ClassDB::get_method(t->target_instance->get_class_name(), t->target_method);
target_param_count = method->get_argument_count();
target_default_arg_count = method->get_default_argument_count();
MethodBind *method = ClassDB::get_method(target_instance->get_class_name(), t->target_method);
if (method) {
target_param_count = method->get_argument_count();
target_default_arg_count = method->get_default_argument_count();
}
}
if (target_param_count >= 1 && target_default_arg_count < target_param_count) {
argc = 1;
Expand All @@ -2652,7 +2660,7 @@ void _Thread::_start_func(void *ud) {

Thread::set_name(t->target_method);

t->ret = t->target_instance->call(t->target_method, arg, argc, ce);
t->ret = target_instance->call(t->target_method, arg, argc, ce);
if (ce.error != Variant::CallError::CALL_OK) {
String reason;
switch (ce.error) {
Expand Down Expand Up @@ -2684,7 +2692,7 @@ Error _Thread::start(Object *p_instance, const StringName &p_method, const Varia

ret = Variant();
target_method = p_method;
target_instance = p_instance;
target_instance_id = p_instance->get_instance_id();
userdata = p_userdata;
active.set();

Expand All @@ -2709,7 +2717,7 @@ Variant _Thread::wait_to_finish() {
thread.wait_to_finish();
Variant r = ret;
target_method = StringName();
target_instance = nullptr;
target_instance_id = ObjectID();
userdata = Variant();
active.clear();

Expand All @@ -2727,7 +2735,7 @@ void _Thread::_bind_methods() {
BIND_ENUM_CONSTANT(PRIORITY_HIGH);
}
_Thread::_Thread() {
target_instance = nullptr;
target_instance_id = ObjectID();
}

_Thread::~_Thread() {
Expand Down
2 changes: 1 addition & 1 deletion core/bind/core_bind.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ class _Thread : public Reference {
Variant ret;
Variant userdata;
SafeFlag active;
Object *target_instance;
ObjectID target_instance_id;
StringName target_method;
Thread thread;
static void _bind_methods();
Expand Down