Skip to content

Correctly free property and method lists #670

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
merged 1 commit into from
Apr 25, 2024
Merged

Correctly free property and method lists #670

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
47 changes: 16 additions & 31 deletions godot-core/src/engine/script_instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,34 +568,19 @@ mod script_instance_info {
p_instance: sys::GDExtensionScriptInstanceDataPtr,
p_prop_info: *const sys::GDExtensionPropertyInfo,
) {
let ctx = || {
format!(
"error while calling {}::get_property_list",
type_name::<T>()
)
};

let length = handle_panic(ctx, || {
let instance = instance_data_as_script_instance::<T>(p_instance);

borrow_instance(instance).get_property_list().len()
})
.unwrap_or_default();

// SAFETY: p_prop_info is expected to have been created by get_property_list_func
// and therefore should have the same length as before. get_propery_list_func
// also guarantees that both vector length and capacity are equal.
let _drop = transfer_ptr_list_from_godot(p_prop_info, length);

// now drop the backing data
let instance = instance_data_as_script_instance::<T>(p_instance);

let _drop = instance
let vec = instance
.property_list
.lock()
.expect("mutex should not be poisoned")
.remove(&p_prop_info)
.expect("we can not free a list that has not been allocated");
.expect("Godot is trying to free the property list, but none has been set");

// SAFETY: p_prop_info is expected to have been created by get_property_list_func
// and therefore should have the same length as before. get_propery_list_func
// also guarantees that both vector length and capacity are equal.
let _drop = transfer_ptr_list_from_godot(p_prop_info, vec.len());
}

/// # Safety
Expand Down Expand Up @@ -706,20 +691,20 @@ mod script_instance_info {
p_instance: sys::GDExtensionScriptInstanceDataPtr,
p_method_info: *const sys::GDExtensionMethodInfo,
) {
let ctx = || format!("error while calling {}::get_method_list", type_name::<T>());

let length = handle_panic(ctx, || {
let instance = instance_data_as_script_instance::<T>(p_instance);
let instance = instance_data_as_script_instance::<T>(p_instance);

borrow_instance(instance).get_method_list().len()
})
.unwrap_or_default();
let vec = instance
.method_list
.lock()
.expect("method_list mutex should not be poisoned")
.remove(&p_method_info)
.expect("Godot is trying to free the method_list, but none has been set");

// SAFETY: p_method_info is expected to have been created by get_method_list_func and therefore should have the same length as before.
// get_method_list_func also guarantees that both vector length and capacity are equal.
let vec = transfer_ptr_list_from_godot(p_method_info, length);
let vec_sys = transfer_ptr_list_from_godot(p_method_info, vec.len());

vec.into_iter().for_each(|method_info| {
vec_sys.into_iter().for_each(|method_info| {
transfer_ptr_list_from_godot(
method_info.arguments,
method_info.argument_count as usize,
Expand Down
Loading