godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

GDExtension: Pass count when freeing method and property lists for script instances

Browse Source
This commit is contained in:
David Snopek
2024-03-01 09:56:19 -06:00
parent df78c0636d
commit 0badf07657
3 changed files with 161 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/object/script_language_extension.h
View File

@@ -655,11 +655,17 @@ VARIANT_ENUM_CAST(ScriptLanguageExtension::CodeCompletionLocation)
class ScriptInstanceExtension : public ScriptInstance {
public:
const GDExtensionScriptInstanceInfo2 *native_info;
const GDExtensionScriptInstanceInfo3 *native_info;
#ifndef DISABLE_DEPRECATED
bool free_native_info = false;
struct {
struct DeprecatedNativeInfo {
GDExtensionScriptInstanceNotification notification_func = nullptr;
} deprecated_native_info;
GDExtensionScriptInstanceFreePropertyList free_property_list_func = nullptr;
GDExtensionScriptInstanceFreeMethodList free_method_list_func = nullptr;
};
DeprecatedNativeInfo *deprecated_native_info = nullptr;
#endif // DISABLE_DEPRECATED
GDExtensionScriptInstanceDataPtr instance = nullptr;
@@ -706,7 +712,11 @@ public:
p_list->push_back(PropertyInfo(pinfo[i]));
}
if (native_info->free_property_list_func) {
native_info->free_property_list_func(instance, pinfo);
native_info->free_property_list_func(instance, pinfo, pcount);
#ifndef DISABLE_DEPRECATED
} else if (deprecated_native_info && deprecated_native_info->free_property_list_func) {
deprecated_native_info->free_property_list_func(instance, pinfo);
#endif // DISABLE_DEPRECATED
}
}
}
@@ -781,7 +791,11 @@ public:
p_list->push_back(MethodInfo(minfo[i]));
}
if (native_info->free_method_list_func) {
native_info->free_method_list_func(instance, minfo);
native_info->free_method_list_func(instance, minfo, mcount);
#ifndef DISABLE_DEPRECATED
} else if (deprecated_native_info && deprecated_native_info->free_method_list_func) {
deprecated_native_info->free_method_list_func(instance, minfo);
#endif // DISABLE_DEPRECATED
}
}
}
@@ -808,8 +822,8 @@ public:
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);
} else if (deprecated_native_info && deprecated_native_info->notification_func) {
deprecated_native_info->notification_func(instance, p_notification);
#endif // DISABLE_DEPRECATED
}
}
@@ -885,9 +899,14 @@ public:
if (native_info->free_func) {
native_info->free_func(instance);
}
#ifndef DISABLE_DEPRECATED
if (free_native_info) {
memfree(const_cast<GDExtensionScriptInstanceInfo2 *>(native_info));
memfree(const_cast<GDExtensionScriptInstanceInfo3 *>(native_info));
}
if (deprecated_native_info) {
memfree(deprecated_native_info);
}
#endif // DISABLE_DEPRECATED
}
#if defined(__GNUC__) && !defined(__clang__)