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

[DRAFT] GDExtension: Fix crash by copying GDExtensionScriptInstanceInfo2 on the Godot side #81205

Closed
wants to merge 1 commit into from
Closed

[DRAFT] GDExtension: Fix crash by copying GDExtensionScriptInstanceInfo2 on the Godot side #81205

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
10 changes: 4 additions & 6 deletions core/extension/gdextension_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,9 @@ static void gdextension_ref_set_object(GDExtensionRefPtr p_ref, GDExtensionObjec

#ifndef DISABLE_DEPRECATED
static GDExtensionScriptInstancePtr gdextension_script_instance_create(const GDExtensionScriptInstanceInfo *p_info, GDExtensionScriptInstanceDataPtr p_instance_data) {
const GDExtensionScriptInstanceInfo2 info_2 = {
ScriptInstanceExtension *script_instance_extension = memnew(ScriptInstanceExtension);
script_instance_extension->instance = p_instance_data;
script_instance_extension->native_info = {
p_info->set_func,
p_info->get_func,
p_info->get_property_list_func,
Expand All @@ -1068,10 +1070,6 @@ static GDExtensionScriptInstancePtr gdextension_script_instance_create(const GDE
p_info->get_language_func,
p_info->free_func,
};

ScriptInstanceExtension *script_instance_extension = memnew(ScriptInstanceExtension);
script_instance_extension->instance = p_instance_data;
script_instance_extension->native_info = &info_2;
script_instance_extension->deprecated_native_info.notification_func = p_info->notification_func;
return reinterpret_cast<GDExtensionScriptInstancePtr>(script_instance_extension);
}
Expand All @@ -1080,7 +1078,7 @@ static GDExtensionScriptInstancePtr gdextension_script_instance_create(const GDE
static GDExtensionScriptInstancePtr gdextension_script_instance_create2(const GDExtensionScriptInstanceInfo2 *p_info, GDExtensionScriptInstanceDataPtr p_instance_data) {
ScriptInstanceExtension *script_instance_extension = memnew(ScriptInstanceExtension);
script_instance_extension->instance = p_instance_data;
script_instance_extension->native_info = p_info;
script_instance_extension->native_info = *p_info;
return reinterpret_cast<GDExtensionScriptInstancePtr>(script_instance_extension);
}

Expand Down
2 changes: 2 additions & 0 deletions core/extension/gdextension_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2194,6 +2194,8 @@ typedef GDExtensionScriptInstancePtr (*GDExtensionInterfaceScriptInstanceCreate)
*
* Creates a script instance that contains the given info and instance data.
*
* Provided struct can be safely freed once the function returns.
*
* @param p_info A pointer to a GDExtensionScriptInstanceInfo2 struct.
* @param p_instance_data A pointer to a data representing the script instance in the GDExtension. This will be passed to all the function pointers on p_info.
*
Expand Down
94 changes: 47 additions & 47 deletions core/object/script_language_extension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ VARIANT_ENUM_CAST(ScriptLanguageExtension::CodeCompletionLocation)

class ScriptInstanceExtension : public ScriptInstance {
public:
const GDExtensionScriptInstanceInfo2 *native_info;
GDExtensionScriptInstanceInfo2 native_info;
struct {
GDExtensionClassNotification notification_func;
} deprecated_native_info;
Expand All @@ -644,21 +644,21 @@ class ScriptInstanceExtension : public ScriptInstance {
#endif

virtual bool set(const StringName &p_name, const Variant &p_value) override {
if (native_info->set_func) {
return native_info->set_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionConstVariantPtr)&p_value);
if (native_info.set_func) {
return native_info.set_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionConstVariantPtr)&p_value);
}
return false;
}
virtual bool get(const StringName &p_name, Variant &r_ret) const override {
if (native_info->get_func) {
return native_info->get_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionVariantPtr)&r_ret);
if (native_info.get_func) {
return native_info.get_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionVariantPtr)&r_ret);
}
return false;
}
virtual void get_property_list(List<PropertyInfo> *p_list) const override {
if (native_info->get_property_list_func) {
if (native_info.get_property_list_func) {
uint32_t pcount;
const GDExtensionPropertyInfo *pinfo = native_info->get_property_list_func(instance, &pcount);
const GDExtensionPropertyInfo *pinfo = native_info.get_property_list_func(instance, &pcount);

#ifdef TOOLS_ENABLED
Ref<Script> script = get_script();
Expand All @@ -670,15 +670,15 @@ class ScriptInstanceExtension : public ScriptInstance {
for (uint32_t i = 0; i < pcount; i++) {
p_list->push_back(PropertyInfo(pinfo[i]));
}
if (native_info->free_property_list_func) {
native_info->free_property_list_func(instance, pinfo);
if (native_info.free_property_list_func) {
native_info.free_property_list_func(instance, pinfo);
}
}
}
virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const override {
if (native_info->get_property_type_func) {
if (native_info.get_property_type_func) {
GDExtensionBool is_valid = 0;
GDExtensionVariantType type = native_info->get_property_type_func(instance, (GDExtensionConstStringNamePtr)&p_name, &is_valid);
GDExtensionVariantType type = native_info.get_property_type_func(instance, (GDExtensionConstStringNamePtr)&p_name, &is_valid);
if (r_is_valid) {
*r_is_valid = is_valid != 0;
}
Expand All @@ -691,21 +691,21 @@ class ScriptInstanceExtension : public ScriptInstance {
}

virtual bool property_can_revert(const StringName &p_name) const override {
if (native_info->property_can_revert_func) {
return native_info->property_can_revert_func(instance, (GDExtensionConstStringNamePtr)&p_name);
if (native_info.property_can_revert_func) {
return native_info.property_can_revert_func(instance, (GDExtensionConstStringNamePtr)&p_name);
}
return false;
}
virtual bool property_get_revert(const StringName &p_name, Variant &r_ret) const override {
if (native_info->property_get_revert_func) {
return native_info->property_get_revert_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionVariantPtr)&r_ret);
if (native_info.property_get_revert_func) {
return native_info.property_get_revert_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionVariantPtr)&r_ret);
}
return false;
}

virtual Object *get_owner() override {
if (native_info->get_owner_func) {
return (Object *)native_info->get_owner_func(instance);
if (native_info.get_owner_func) {
return (Object *)native_info.get_owner_func(instance);
}
return nullptr;
}
Expand All @@ -714,35 +714,35 @@ class ScriptInstanceExtension : public ScriptInstance {
state->push_back(Pair<StringName, Variant>(*(const StringName *)p_name, *(const Variant *)p_value));
}
virtual void get_property_state(List<Pair<StringName, Variant>> &state) override {
if (native_info->get_property_state_func) {
native_info->get_property_state_func(instance, _add_property_with_state, &state);
if (native_info.get_property_state_func) {
native_info.get_property_state_func(instance, _add_property_with_state, &state);
}
}

virtual void get_method_list(List<MethodInfo> *p_list) const override {
if (native_info->get_method_list_func) {
if (native_info.get_method_list_func) {
uint32_t mcount;
const GDExtensionMethodInfo *minfo = native_info->get_method_list_func(instance, &mcount);
const GDExtensionMethodInfo *minfo = native_info.get_method_list_func(instance, &mcount);
for (uint32_t i = 0; i < mcount; i++) {
p_list->push_back(MethodInfo(minfo[i]));
}
if (native_info->free_method_list_func) {
native_info->free_method_list_func(instance, minfo);
if (native_info.free_method_list_func) {
native_info.free_method_list_func(instance, minfo);
}
}
}
virtual bool has_method(const StringName &p_method) const override {
if (native_info->has_method_func) {
return native_info->has_method_func(instance, (GDExtensionStringNamePtr)&p_method);
if (native_info.has_method_func) {
return native_info.has_method_func(instance, (GDExtensionStringNamePtr)&p_method);
}
return false;
}

virtual Variant callp(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override {
Variant ret;
if (native_info->call_func) {
if (native_info.call_func) {
GDExtensionCallError ce;
native_info->call_func(instance, (GDExtensionConstStringNamePtr)&p_method, (GDExtensionConstVariantPtr *)p_args, p_argcount, (GDExtensionVariantPtr)&ret, &ce);
native_info.call_func(instance, (GDExtensionConstStringNamePtr)&p_method, (GDExtensionConstVariantPtr *)p_args, p_argcount, (GDExtensionVariantPtr)&ret, &ce);
r_error.error = Callable::CallError::Error(ce.error);
r_error.argument = ce.argument;
r_error.expected = ce.expected;
Expand All @@ -751,8 +751,8 @@ class ScriptInstanceExtension : public ScriptInstance {
}

virtual void notification(int p_notification, bool p_reversed = false) override {
if (native_info->notification_func) {
native_info->notification_func(instance, p_notification, p_reversed);
if (native_info.notification_func) {
native_info.notification_func(instance, p_notification, p_reversed);
#ifndef DISABLE_DEPRECATED
} else if (deprecated_native_info.notification_func) {
deprecated_native_info.notification_func(instance, p_notification);
Expand All @@ -761,10 +761,10 @@ class ScriptInstanceExtension : public ScriptInstance {
}

virtual String to_string(bool *r_valid) override {
if (native_info->to_string_func) {
if (native_info.to_string_func) {
GDExtensionBool valid;
String ret;
native_info->to_string_func(instance, &valid, reinterpret_cast<GDExtensionStringPtr>(&ret));
native_info.to_string_func(instance, &valid, reinterpret_cast<GDExtensionStringPtr>(&ret));
if (r_valid) {
*r_valid = valid != 0;
}
Expand All @@ -774,44 +774,44 @@ class ScriptInstanceExtension : public ScriptInstance {
}

virtual void refcount_incremented() override {
if (native_info->refcount_incremented_func) {
native_info->refcount_incremented_func(instance);
if (native_info.refcount_incremented_func) {
native_info.refcount_incremented_func(instance);
}
}
virtual bool refcount_decremented() override {
if (native_info->refcount_decremented_func) {
return native_info->refcount_decremented_func(instance);
if (native_info.refcount_decremented_func) {
return native_info.refcount_decremented_func(instance);
}
return false;
}

virtual Ref<Script> get_script() const override {
if (native_info->get_script_func) {
GDExtensionObjectPtr script = native_info->get_script_func(instance);
if (native_info.get_script_func) {
GDExtensionObjectPtr script = native_info.get_script_func(instance);
return Ref<Script>(reinterpret_cast<Script *>(script));
}
return Ref<Script>();
}

virtual bool is_placeholder() const override {
if (native_info->is_placeholder_func) {
return native_info->is_placeholder_func(instance);
if (native_info.is_placeholder_func) {
return native_info.is_placeholder_func(instance);
}
return false;
}

virtual void property_set_fallback(const StringName &p_name, const Variant &p_value, bool *r_valid) override {
if (native_info->set_fallback_func) {
bool ret = native_info->set_fallback_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionConstVariantPtr)&p_value);
if (native_info.set_fallback_func) {
bool ret = native_info.set_fallback_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionConstVariantPtr)&p_value);
if (r_valid) {
*r_valid = ret;
}
}
}
virtual Variant property_get_fallback(const StringName &p_name, bool *r_valid) override {
Variant ret;
if (native_info->get_fallback_func) {
bool valid = native_info->get_fallback_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionVariantPtr)&ret);
if (native_info.get_fallback_func) {
bool valid = native_info.get_fallback_func(instance, (GDExtensionConstStringNamePtr)&p_name, (GDExtensionVariantPtr)&ret);
if (r_valid) {
*r_valid = valid;
}
Expand All @@ -820,16 +820,16 @@ class ScriptInstanceExtension : public ScriptInstance {
}

virtual ScriptLanguage *get_language() override {
if (native_info->get_language_func) {
GDExtensionScriptLanguagePtr lang = native_info->get_language_func(instance);
if (native_info.get_language_func) {
GDExtensionScriptLanguagePtr lang = native_info.get_language_func(instance);
return reinterpret_cast<ScriptLanguage *>(lang);
}
return nullptr;
;
}
virtual ~ScriptInstanceExtension() {
if (native_info->free_func) {
native_info->free_func(instance);
if (native_info.free_func) {
native_info.free_func(instance);
}
}

Expand Down