correctly free property and method lists

Author: TitanNano

godot-core/src/engine/script_instance.rs

@@ -575,27 +575,22 @@ mod script_instance_info {
             )
         };
 
-        let length = handle_panic(ctx, || {
+        let vec = handle_panic(ctx, || {
             let instance = instance_data_as_script_instance::<T>(p_instance);
 
-            borrow_instance(instance).get_property_list().len()
+            instance
+                .property_list
+                .lock()
+                .expect("mutext should not be poisoned")
+                .remove(&p_prop_info)
+                .expect("godot is trying to free the property list, but none has been set")
         })
         .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
-            .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");
+        let _drop = transfer_ptr_list_from_godot(p_prop_info, vec.len());
     }
 
     /// # Safety
@@ -708,18 +703,23 @@ mod script_instance_info {
     ) {
         let ctx = || format!("error while calling {}::get_method_list", type_name::<T>());
 
-        let length = handle_panic(ctx, || {
+        let vec = handle_panic(ctx, || {
             let instance = instance_data_as_script_instance::<T>(p_instance);
 
-            borrow_instance(instance).get_method_list().len()
+            instance
+                .method_list
+                .lock()
+                .expect("method_list mutext should not be poisoned")
+                .remove(&p_method_info)
+                .expect("godot is trying to free the method_list, but none has been set")
         })
         .unwrap_or_default();
 
         // 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,