#140: Mark drop_c_string as unsafe

astonbitecode · astonbitecode · commit 5535fc906be4 · 2024-12-06T10:43:44.000+02:00
diff --git a/rust/src/api/mod.rs b/rust/src/api/mod.rs
@@ -182,7 +182,7 @@ impl Jvm {
 
                 cstrings_to_drop
                     .into_iter()
-                    .for_each(utils::drop_c_string);
+                    .for_each(|s| unsafe {utils::drop_c_string(s)});
 
                 int_result
             };
diff --git a/rust/src/cache.rs b/rust/src/cache.rs
@@ -820,7 +820,7 @@ pub(crate) fn set_utils_exception_to_string_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_utils_exception_to_string_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_utils_exception_to_string_method() -> errors::Result<jmethodID> {
     get_cached!(
         UTILS_THROWABLE_TO_STRING_METHOD,
         {
@@ -873,7 +873,7 @@ pub(crate) fn set_factory_constructor_method(j: jmethodID) {
 }
 
 #[allow(dead_code)]
-pub(crate) fn get_factory_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_factory_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         FACTORY_CONSTRUCTOR_METHOD,
         {
@@ -900,7 +900,7 @@ pub(crate) fn set_factory_instantiate_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_factory_instantiate_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_factory_instantiate_method() -> errors::Result<jmethodID> {
     get_cached!(
         FACTORY_INSTANTIATE_METHOD,
         {
@@ -935,7 +935,7 @@ pub(crate) fn set_factory_create_for_static_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_factory_create_for_static_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_factory_create_for_static_method() -> errors::Result<jmethodID> {
     get_cached!(
         FACTORY_CREATE_FOR_STATIC_METHOD,
         {
@@ -969,7 +969,7 @@ pub(crate) fn set_factory_create_java_array_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_factory_create_java_array_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_factory_create_java_array_method() -> errors::Result<jmethodID> {
     get_cached!(
         FACTORY_CREATE_JAVA_ARRAY_METHOD,
         {
@@ -1005,7 +1005,7 @@ pub(crate) fn set_factory_create_java_list_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_factory_create_java_list_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_factory_create_java_list_method() -> errors::Result<jmethodID> {
     get_cached!(
         FACTORY_CREATE_JAVA_LIST_METHOD,
         {
@@ -1041,7 +1041,7 @@ pub(crate) fn set_factory_create_java_map_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_factory_create_java_map_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_factory_create_java_map_method() -> errors::Result<jmethodID> {
     get_cached!(
         FACTORY_CREATE_JAVA_MAP_METHOD,
         {
@@ -1120,7 +1120,7 @@ pub(crate) fn set_invoke_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_invoke_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_invoke_method() -> errors::Result<jmethodID> {
     get_cached!(
         INVOKE_METHOD,
         {
@@ -1157,7 +1157,7 @@ pub(crate) fn set_invoke_static_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_invoke_static_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_invoke_static_method() -> errors::Result<jmethodID> {
     get_cached!(
         INVOKE_STATIC_METHOD,
         {
@@ -1194,7 +1194,7 @@ pub(crate) fn set_invoke_to_channel_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_invoke_to_channel_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_invoke_to_channel_method() -> errors::Result<jmethodID> {
     get_cached!(
         INVOKE_TO_CHANNEL_METHOD,
         {
@@ -1229,7 +1229,7 @@ pub(crate) fn set_invoke_async_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_invoke_async_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_invoke_async_method() -> errors::Result<jmethodID> {
     get_cached!(
         INVOKE_ASYNC_METHOD,
         {
@@ -1264,7 +1264,7 @@ pub(crate) fn set_init_callback_channel_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_init_callback_channel_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_init_callback_channel_method() -> errors::Result<jmethodID> {
     get_cached!(
         INIT_CALLBACK_CHANNEL_METHOD,
         {
@@ -1298,7 +1298,7 @@ pub(crate) fn set_field_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_field_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_field_method() -> errors::Result<jmethodID> {
     get_cached!(
         FIELD_METHOD,
         {
@@ -1332,7 +1332,7 @@ pub(crate) fn set_clone_static_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_clone_static_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_clone_static_method() -> errors::Result<jmethodID> {
     get_cached!(
         CLONE_STATIC_METHOD,
         {
@@ -1366,7 +1366,7 @@ pub(crate) fn set_cast_static_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_cast_static_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_cast_static_method() -> errors::Result<jmethodID> {
     get_cached!(
         CAST_STATIC_METHOD,
         {
@@ -1404,7 +1404,7 @@ pub(crate) fn set_get_json_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_get_json_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_get_json_method() -> errors::Result<jmethodID> {
     get_cached!(
         GET_JSON_METHOD,
         {
@@ -1439,7 +1439,7 @@ pub(crate) fn set_check_equals_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_check_equals_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_check_equals_method() -> errors::Result<jmethodID> {
     get_cached!(
         CHECK_EQUALS_METHOD,
         {
@@ -1474,7 +1474,7 @@ pub(crate) fn set_get_object_class_name_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_get_object_class_name_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_get_object_class_name_method() -> errors::Result<jmethodID> {
     get_cached!(
         GET_OBJECT_CLASS_NAME_METHOD,
         {
@@ -1509,7 +1509,7 @@ pub(crate) fn set_get_object_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_get_object_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_get_object_method() -> errors::Result<jmethodID> {
     get_cached!(
         GET_OBJECT_METHOD,
         {
@@ -1544,7 +1544,7 @@ pub(crate) fn set_inv_arg_java_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_inv_arg_java_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_inv_arg_java_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         INV_ARG_JAVA_CONSTRUCTOR_METHOD,
         {
@@ -1578,7 +1578,7 @@ pub(crate) fn set_inv_arg_rust_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_inv_arg_rust_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_inv_arg_rust_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         INV_ARG_RUST_CONSTRUCTOR_METHOD,
         {
@@ -1607,7 +1607,7 @@ pub(crate) fn set_inv_arg_basic_rust_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_inv_arg_basic_rust_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_inv_arg_basic_rust_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         INV_ARG_BASIC_RUST_CONSTRUCTOR_METHOD,
         {
@@ -1688,7 +1688,7 @@ pub(crate) fn set_integer_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_integer_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_integer_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         INTEGER_CONSTRUCTOR_METHOD,
         {
@@ -1716,7 +1716,7 @@ pub(crate) fn set_integer_to_int_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_integer_to_int_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_integer_to_int_method() -> errors::Result<jmethodID> {
     get_cached!(
         INTEGER_TO_INT_METHOD,
         {
@@ -1784,7 +1784,7 @@ pub(crate) fn set_long_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_long_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_long_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         LONG_CONSTRUCTOR_METHOD,
         {
@@ -1812,7 +1812,7 @@ pub(crate) fn set_long_to_long_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_long_to_long_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_long_to_long_method() -> errors::Result<jmethodID> {
     get_cached!(
         LONG_TO_LONG_METHOD,
         {
@@ -1860,7 +1860,7 @@ pub(crate) fn set_short_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_short_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_short_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         SHORT_CONSTRUCTOR_METHOD,
         {
@@ -1888,7 +1888,7 @@ pub(crate) fn set_short_to_short_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_short_to_short_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_short_to_short_method() -> errors::Result<jmethodID> {
     get_cached!(
         SHORT_TO_SHORT_METHOD,
         {
@@ -1936,7 +1936,7 @@ pub(crate) fn set_character_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_character_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_character_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         CHARACTER_CONSTRUCTOR_METHOD,
         {
@@ -1964,7 +1964,7 @@ pub(crate) fn set_character_to_char_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_character_to_char_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_character_to_char_method() -> errors::Result<jmethodID> {
     get_cached!(
         CHARACTER_TO_CHAR_METHOD,
         {
@@ -2012,7 +2012,7 @@ pub(crate) fn set_byte_constructor_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_byte_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_byte_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         BYTE_CONSTRUCTOR_METHOD,
         {
@@ -2040,7 +2040,7 @@ pub(crate) fn set_byte_to_byte_method(j: jmethodID) {
     });
 }
 
-pub(crate) fn get_byte_to_byte_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_byte_to_byte_method() -> errors::Result<jmethodID> {
     get_cached!(
         BYTE_TO_BYTE_METHOD,
         {
@@ -2092,7 +2092,7 @@ pub(crate) fn set_float_constructor_method(j: jmethodID) {
 }
 
 #[allow(dead_code)]
-pub(crate) fn get_float_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_float_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         FLOAT_CONSTRUCTOR_METHOD,
         {
@@ -2122,7 +2122,7 @@ pub(crate) fn set_float_to_float_method(j: jmethodID) {
 }
 
 #[allow(dead_code)]
-pub(crate) fn get_float_to_float_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_float_to_float_method() -> errors::Result<jmethodID> {
     get_cached!(
         FLOAT_TO_FLOAT_METHOD,
         {
@@ -2174,7 +2174,7 @@ pub(crate) fn set_double_constructor_method(j: jmethodID) {
 }
 
 #[allow(dead_code)]
-pub(crate) fn get_double_constructor_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_double_constructor_method() -> errors::Result<jmethodID> {
     get_cached!(
         DOUBLE_CONSTRUCTOR_METHOD,
         {
@@ -2204,7 +2204,7 @@ pub(crate) fn set_double_to_double_method(j: jmethodID) {
 }
 
 #[allow(dead_code)]
-pub(crate) fn get_double_to_double_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_double_to_double_method() -> errors::Result<jmethodID> {
     get_cached!(
         DOUBLE_TO_DOUBLE_METHOD,
         {
@@ -2277,7 +2277,7 @@ pub(crate) fn set_get_classloader_method(j: jmethodID) {
 }
 
 #[cfg(target_os = "android")]
-pub(crate) fn get_get_classloader_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_get_classloader_method() -> errors::Result<jmethodID> {
     get_cached!(
         GET_CLASSLOADER_METHOD,
         {
@@ -2304,7 +2304,7 @@ pub(crate) fn set_load_class_method(j: jmethodID) {
 }
 
 #[cfg(target_os = "android")]
-pub(crate) fn get_load_class_method() -> errors::Result<jmethodID> {
+pub(crate) unsafe fn get_load_class_method() -> errors::Result<jmethodID> {
     get_cached!(
         GET_LOAD_CLASS_METHOD,
         {
diff --git a/rust/src/utils.rs b/rust/src/utils.rs
@@ -41,8 +41,8 @@ pub fn to_c_string_struct(string: &str) -> CString {
     unsafe { CString::from_vec_unchecked(enc) }
 }
 
-pub fn drop_c_string(ptr: *mut c_char) {
-    let _ = unsafe { CString::from_raw(ptr) };
+pub unsafe fn drop_c_string(ptr: *mut c_char) {
+    let _ = CString::from_raw(ptr);
 }
 
 #[cfg(not(target_os = "windows"))]

Original file line number	Diff line number	Diff line change
`@@ -820,7 +820,7 @@ pub(crate) fn set_utils_exception_to_string_method(j: jmethodID) {`
`820`	`820`	`});`
`821`	`821`	`}`
`822`	`822`
`823`		`-pub(crate) fn get_utils_exception_to_string_method() -> errors::Result<jmethodID> {`
	`823`	`+pub(crate) unsafe fn get_utils_exception_to_string_method() -> errors::Result<jmethodID> {`
`824`	`824`	`get_cached!(`
`825`	`825`	`UTILS_THROWABLE_TO_STRING_METHOD,`
`826`	`826`	`{`
`@@ -873,7 +873,7 @@ pub(crate) fn set_factory_constructor_method(j: jmethodID) {`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	`#[allow(dead_code)]`
`876`		`-pub(crate) fn get_factory_constructor_method() -> errors::Result<jmethodID> {`
	`876`	`+pub(crate) unsafe fn get_factory_constructor_method() -> errors::Result<jmethodID> {`
`877`	`877`	`get_cached!(`
`878`	`878`	`FACTORY_CONSTRUCTOR_METHOD,`
`879`	`879`	`{`
`@@ -900,7 +900,7 @@ pub(crate) fn set_factory_instantiate_method(j: jmethodID) {`
`900`	`900`	`});`
`901`	`901`	`}`
`902`	`902`
`903`		`-pub(crate) fn get_factory_instantiate_method() -> errors::Result<jmethodID> {`
	`903`	`+pub(crate) unsafe fn get_factory_instantiate_method() -> errors::Result<jmethodID> {`
`904`	`904`	`get_cached!(`
`905`	`905`	`FACTORY_INSTANTIATE_METHOD,`
`906`	`906`	`{`
`@@ -935,7 +935,7 @@ pub(crate) fn set_factory_create_for_static_method(j: jmethodID) {`
`935`	`935`	`});`
`936`	`936`	`}`
`937`	`937`
`938`		`-pub(crate) fn get_factory_create_for_static_method() -> errors::Result<jmethodID> {`
	`938`	`+pub(crate) unsafe fn get_factory_create_for_static_method() -> errors::Result<jmethodID> {`
`939`	`939`	`get_cached!(`
`940`	`940`	`FACTORY_CREATE_FOR_STATIC_METHOD,`
`941`	`941`	`{`
`@@ -969,7 +969,7 @@ pub(crate) fn set_factory_create_java_array_method(j: jmethodID) {`
`969`	`969`	`});`
`970`	`970`	`}`
`971`	`971`
`972`		`-pub(crate) fn get_factory_create_java_array_method() -> errors::Result<jmethodID> {`
	`972`	`+pub(crate) unsafe fn get_factory_create_java_array_method() -> errors::Result<jmethodID> {`
`973`	`973`	`get_cached!(`
`974`	`974`	`FACTORY_CREATE_JAVA_ARRAY_METHOD,`
`975`	`975`	`{`
`@@ -1005,7 +1005,7 @@ pub(crate) fn set_factory_create_java_list_method(j: jmethodID) {`
`1005`	`1005`	`});`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`		`-pub(crate) fn get_factory_create_java_list_method() -> errors::Result<jmethodID> {`
	`1008`	`+pub(crate) unsafe fn get_factory_create_java_list_method() -> errors::Result<jmethodID> {`
`1009`	`1009`	`get_cached!(`
`1010`	`1010`	`FACTORY_CREATE_JAVA_LIST_METHOD,`
`1011`	`1011`	`{`
`@@ -1041,7 +1041,7 @@ pub(crate) fn set_factory_create_java_map_method(j: jmethodID) {`
`1041`	`1041`	`});`
`1042`	`1042`	`}`
`1043`	`1043`
`1044`		`-pub(crate) fn get_factory_create_java_map_method() -> errors::Result<jmethodID> {`
	`1044`	`+pub(crate) unsafe fn get_factory_create_java_map_method() -> errors::Result<jmethodID> {`
`1045`	`1045`	`get_cached!(`
`1046`	`1046`	`FACTORY_CREATE_JAVA_MAP_METHOD,`
`1047`	`1047`	`{`
`@@ -1120,7 +1120,7 @@ pub(crate) fn set_invoke_method(j: jmethodID) {`
`1120`	`1120`	`});`
`1121`	`1121`	`}`
`1122`	`1122`
`1123`		`-pub(crate) fn get_invoke_method() -> errors::Result<jmethodID> {`
	`1123`	`+pub(crate) unsafe fn get_invoke_method() -> errors::Result<jmethodID> {`
`1124`	`1124`	`get_cached!(`
`1125`	`1125`	`INVOKE_METHOD,`
`1126`	`1126`	`{`
`@@ -1157,7 +1157,7 @@ pub(crate) fn set_invoke_static_method(j: jmethodID) {`
`1157`	`1157`	`});`
`1158`	`1158`	`}`
`1159`	`1159`
`1160`		`-pub(crate) fn get_invoke_static_method() -> errors::Result<jmethodID> {`
	`1160`	`+pub(crate) unsafe fn get_invoke_static_method() -> errors::Result<jmethodID> {`
`1161`	`1161`	`get_cached!(`
`1162`	`1162`	`INVOKE_STATIC_METHOD,`
`1163`	`1163`	`{`
`@@ -1194,7 +1194,7 @@ pub(crate) fn set_invoke_to_channel_method(j: jmethodID) {`
`1194`	`1194`	`});`
`1195`	`1195`	`}`
`1196`	`1196`
`1197`		`-pub(crate) fn get_invoke_to_channel_method() -> errors::Result<jmethodID> {`
	`1197`	`+pub(crate) unsafe fn get_invoke_to_channel_method() -> errors::Result<jmethodID> {`
`1198`	`1198`	`get_cached!(`
`1199`	`1199`	`INVOKE_TO_CHANNEL_METHOD,`
`1200`	`1200`	`{`
`@@ -1229,7 +1229,7 @@ pub(crate) fn set_invoke_async_method(j: jmethodID) {`
`1229`	`1229`	`});`
`1230`	`1230`	`}`
`1231`	`1231`
`1232`		`-pub(crate) fn get_invoke_async_method() -> errors::Result<jmethodID> {`
	`1232`	`+pub(crate) unsafe fn get_invoke_async_method() -> errors::Result<jmethodID> {`
`1233`	`1233`	`get_cached!(`
`1234`	`1234`	`INVOKE_ASYNC_METHOD,`
`1235`	`1235`	`{`
`@@ -1264,7 +1264,7 @@ pub(crate) fn set_init_callback_channel_method(j: jmethodID) {`
`1264`	`1264`	`});`
`1265`	`1265`	`}`
`1266`	`1266`
`1267`		`-pub(crate) fn get_init_callback_channel_method() -> errors::Result<jmethodID> {`
	`1267`	`+pub(crate) unsafe fn get_init_callback_channel_method() -> errors::Result<jmethodID> {`
`1268`	`1268`	`get_cached!(`
`1269`	`1269`	`INIT_CALLBACK_CHANNEL_METHOD,`
`1270`	`1270`	`{`
`@@ -1298,7 +1298,7 @@ pub(crate) fn set_field_method(j: jmethodID) {`
`1298`	`1298`	`});`
`1299`	`1299`	`}`
`1300`	`1300`
`1301`		`-pub(crate) fn get_field_method() -> errors::Result<jmethodID> {`
	`1301`	`+pub(crate) unsafe fn get_field_method() -> errors::Result<jmethodID> {`
`1302`	`1302`	`get_cached!(`
`1303`	`1303`	`FIELD_METHOD,`
`1304`	`1304`	`{`
`@@ -1332,7 +1332,7 @@ pub(crate) fn set_clone_static_method(j: jmethodID) {`
`1332`	`1332`	`});`
`1333`	`1333`	`}`
`1334`	`1334`
`1335`		`-pub(crate) fn get_clone_static_method() -> errors::Result<jmethodID> {`
	`1335`	`+pub(crate) unsafe fn get_clone_static_method() -> errors::Result<jmethodID> {`
`1336`	`1336`	`get_cached!(`
`1337`	`1337`	`CLONE_STATIC_METHOD,`
`1338`	`1338`	`{`
`@@ -1366,7 +1366,7 @@ pub(crate) fn set_cast_static_method(j: jmethodID) {`
`1366`	`1366`	`});`
`1367`	`1367`	`}`
`1368`	`1368`
`1369`		`-pub(crate) fn get_cast_static_method() -> errors::Result<jmethodID> {`
	`1369`	`+pub(crate) unsafe fn get_cast_static_method() -> errors::Result<jmethodID> {`
`1370`	`1370`	`get_cached!(`
`1371`	`1371`	`CAST_STATIC_METHOD,`
`1372`	`1372`	`{`
`@@ -1404,7 +1404,7 @@ pub(crate) fn set_get_json_method(j: jmethodID) {`
`1404`	`1404`	`});`
`1405`	`1405`	`}`
`1406`	`1406`
`1407`		`-pub(crate) fn get_get_json_method() -> errors::Result<jmethodID> {`
	`1407`	`+pub(crate) unsafe fn get_get_json_method() -> errors::Result<jmethodID> {`
`1408`	`1408`	`get_cached!(`
`1409`	`1409`	`GET_JSON_METHOD,`
`1410`	`1410`	`{`
`@@ -1439,7 +1439,7 @@ pub(crate) fn set_check_equals_method(j: jmethodID) {`
`1439`	`1439`	`});`
`1440`	`1440`	`}`
`1441`	`1441`
`1442`		`-pub(crate) fn get_check_equals_method() -> errors::Result<jmethodID> {`
	`1442`	`+pub(crate) unsafe fn get_check_equals_method() -> errors::Result<jmethodID> {`
`1443`	`1443`	`get_cached!(`
`1444`	`1444`	`CHECK_EQUALS_METHOD,`
`1445`	`1445`	`{`
`@@ -1474,7 +1474,7 @@ pub(crate) fn set_get_object_class_name_method(j: jmethodID) {`
`1474`	`1474`	`});`
`1475`	`1475`	`}`
`1476`	`1476`
`1477`		`-pub(crate) fn get_get_object_class_name_method() -> errors::Result<jmethodID> {`
	`1477`	`+pub(crate) unsafe fn get_get_object_class_name_method() -> errors::Result<jmethodID> {`
`1478`	`1478`	`get_cached!(`
`1479`	`1479`	`GET_OBJECT_CLASS_NAME_METHOD,`
`1480`	`1480`	`{`
`@@ -1509,7 +1509,7 @@ pub(crate) fn set_get_object_method(j: jmethodID) {`
`1509`	`1509`	`});`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`		`-pub(crate) fn get_get_object_method() -> errors::Result<jmethodID> {`
	`1512`	`+pub(crate) unsafe fn get_get_object_method() -> errors::Result<jmethodID> {`
`1513`	`1513`	`get_cached!(`
`1514`	`1514`	`GET_OBJECT_METHOD,`
`1515`	`1515`	`{`
`@@ -1544,7 +1544,7 @@ pub(crate) fn set_inv_arg_java_constructor_method(j: jmethodID) {`
`1544`	`1544`	`});`
`1545`	`1545`	`}`
`1546`	`1546`
`1547`		`-pub(crate) fn get_inv_arg_java_constructor_method() -> errors::Result<jmethodID> {`
	`1547`	`+pub(crate) unsafe fn get_inv_arg_java_constructor_method() -> errors::Result<jmethodID> {`
`1548`	`1548`	`get_cached!(`
`1549`	`1549`	`INV_ARG_JAVA_CONSTRUCTOR_METHOD,`
`1550`	`1550`	`{`
`@@ -1578,7 +1578,7 @@ pub(crate) fn set_inv_arg_rust_constructor_method(j: jmethodID) {`
`1578`	`1578`	`});`
`1579`	`1579`	`}`
`1580`	`1580`
`1581`		`-pub(crate) fn get_inv_arg_rust_constructor_method() -> errors::Result<jmethodID> {`
	`1581`	`+pub(crate) unsafe fn get_inv_arg_rust_constructor_method() -> errors::Result<jmethodID> {`
`1582`	`1582`	`get_cached!(`
`1583`	`1583`	`INV_ARG_RUST_CONSTRUCTOR_METHOD,`
`1584`	`1584`	`{`
`@@ -1607,7 +1607,7 @@ pub(crate) fn set_inv_arg_basic_rust_constructor_method(j: jmethodID) {`
`1607`	`1607`	`});`
`1608`	`1608`	`}`
`1609`	`1609`
`1610`		`-pub(crate) fn get_inv_arg_basic_rust_constructor_method() -> errors::Result<jmethodID> {`
	`1610`	`+pub(crate) unsafe fn get_inv_arg_basic_rust_constructor_method() -> errors::Result<jmethodID> {`
`1611`	`1611`	`get_cached!(`
`1612`	`1612`	`INV_ARG_BASIC_RUST_CONSTRUCTOR_METHOD,`
`1613`	`1613`	`{`
`@@ -1688,7 +1688,7 @@ pub(crate) fn set_integer_constructor_method(j: jmethodID) {`
`1688`	`1688`	`});`
`1689`	`1689`	`}`
`1690`	`1690`
`1691`		`-pub(crate) fn get_integer_constructor_method() -> errors::Result<jmethodID> {`
	`1691`	`+pub(crate) unsafe fn get_integer_constructor_method() -> errors::Result<jmethodID> {`
`1692`	`1692`	`get_cached!(`
`1693`	`1693`	`INTEGER_CONSTRUCTOR_METHOD,`
`1694`	`1694`	`{`
`@@ -1716,7 +1716,7 @@ pub(crate) fn set_integer_to_int_method(j: jmethodID) {`
`1716`	`1716`	`});`
`1717`	`1717`	`}`
`1718`	`1718`
`1719`		`-pub(crate) fn get_integer_to_int_method() -> errors::Result<jmethodID> {`
	`1719`	`+pub(crate) unsafe fn get_integer_to_int_method() -> errors::Result<jmethodID> {`
`1720`	`1720`	`get_cached!(`
`1721`	`1721`	`INTEGER_TO_INT_METHOD,`
`1722`	`1722`	`{`
`@@ -1784,7 +1784,7 @@ pub(crate) fn set_long_constructor_method(j: jmethodID) {`
`1784`	`1784`	`});`
`1785`	`1785`	`}`
`1786`	`1786`
`1787`		`-pub(crate) fn get_long_constructor_method() -> errors::Result<jmethodID> {`
	`1787`	`+pub(crate) unsafe fn get_long_constructor_method() -> errors::Result<jmethodID> {`
`1788`	`1788`	`get_cached!(`
`1789`	`1789`	`LONG_CONSTRUCTOR_METHOD,`
`1790`	`1790`	`{`
`@@ -1812,7 +1812,7 @@ pub(crate) fn set_long_to_long_method(j: jmethodID) {`
`1812`	`1812`	`});`
`1813`	`1813`	`}`
`1814`	`1814`
`1815`		`-pub(crate) fn get_long_to_long_method() -> errors::Result<jmethodID> {`
	`1815`	`+pub(crate) unsafe fn get_long_to_long_method() -> errors::Result<jmethodID> {`
`1816`	`1816`	`get_cached!(`
`1817`	`1817`	`LONG_TO_LONG_METHOD,`
`1818`	`1818`	`{`
`@@ -1860,7 +1860,7 @@ pub(crate) fn set_short_constructor_method(j: jmethodID) {`
`1860`	`1860`	`});`
`1861`	`1861`	`}`
`1862`	`1862`
`1863`		`-pub(crate) fn get_short_constructor_method() -> errors::Result<jmethodID> {`
	`1863`	`+pub(crate) unsafe fn get_short_constructor_method() -> errors::Result<jmethodID> {`
`1864`	`1864`	`get_cached!(`
`1865`	`1865`	`SHORT_CONSTRUCTOR_METHOD,`
`1866`	`1866`	`{`
`@@ -1888,7 +1888,7 @@ pub(crate) fn set_short_to_short_method(j: jmethodID) {`
`1888`	`1888`	`});`
`1889`	`1889`	`}`
`1890`	`1890`
`1891`		`-pub(crate) fn get_short_to_short_method() -> errors::Result<jmethodID> {`
	`1891`	`+pub(crate) unsafe fn get_short_to_short_method() -> errors::Result<jmethodID> {`
`1892`	`1892`	`get_cached!(`
`1893`	`1893`	`SHORT_TO_SHORT_METHOD,`
`1894`	`1894`	`{`
`@@ -1936,7 +1936,7 @@ pub(crate) fn set_character_constructor_method(j: jmethodID) {`
`1936`	`1936`	`});`
`1937`	`1937`	`}`
`1938`	`1938`
`1939`		`-pub(crate) fn get_character_constructor_method() -> errors::Result<jmethodID> {`
	`1939`	`+pub(crate) unsafe fn get_character_constructor_method() -> errors::Result<jmethodID> {`
`1940`	`1940`	`get_cached!(`
`1941`	`1941`	`CHARACTER_CONSTRUCTOR_METHOD,`
`1942`	`1942`	`{`
`@@ -1964,7 +1964,7 @@ pub(crate) fn set_character_to_char_method(j: jmethodID) {`
`1964`	`1964`	`});`
`1965`	`1965`	`}`
`1966`	`1966`
`1967`		`-pub(crate) fn get_character_to_char_method() -> errors::Result<jmethodID> {`
	`1967`	`+pub(crate) unsafe fn get_character_to_char_method() -> errors::Result<jmethodID> {`
`1968`	`1968`	`get_cached!(`
`1969`	`1969`	`CHARACTER_TO_CHAR_METHOD,`
`1970`	`1970`	`{`
`@@ -2012,7 +2012,7 @@ pub(crate) fn set_byte_constructor_method(j: jmethodID) {`
`2012`	`2012`	`});`
`2013`	`2013`	`}`
`2014`	`2014`
`2015`		`-pub(crate) fn get_byte_constructor_method() -> errors::Result<jmethodID> {`
	`2015`	`+pub(crate) unsafe fn get_byte_constructor_method() -> errors::Result<jmethodID> {`
`2016`	`2016`	`get_cached!(`
`2017`	`2017`	`BYTE_CONSTRUCTOR_METHOD,`
`2018`	`2018`	`{`
`@@ -2040,7 +2040,7 @@ pub(crate) fn set_byte_to_byte_method(j: jmethodID) {`
`2040`	`2040`	`});`
`2041`	`2041`	`}`
`2042`	`2042`
`2043`		`-pub(crate) fn get_byte_to_byte_method() -> errors::Result<jmethodID> {`
	`2043`	`+pub(crate) unsafe fn get_byte_to_byte_method() -> errors::Result<jmethodID> {`
`2044`	`2044`	`get_cached!(`
`2045`	`2045`	`BYTE_TO_BYTE_METHOD,`
`2046`	`2046`	`{`
`@@ -2092,7 +2092,7 @@ pub(crate) fn set_float_constructor_method(j: jmethodID) {`
`2092`	`2092`	`}`
`2093`	`2093`
`2094`	`2094`	`#[allow(dead_code)]`
`2095`		`-pub(crate) fn get_float_constructor_method() -> errors::Result<jmethodID> {`
	`2095`	`+pub(crate) unsafe fn get_float_constructor_method() -> errors::Result<jmethodID> {`
`2096`	`2096`	`get_cached!(`
`2097`	`2097`	`FLOAT_CONSTRUCTOR_METHOD,`
`2098`	`2098`	`{`
`@@ -2122,7 +2122,7 @@ pub(crate) fn set_float_to_float_method(j: jmethodID) {`
`2122`	`2122`	`}`
`2123`	`2123`
`2124`	`2124`	`#[allow(dead_code)]`
`2125`		`-pub(crate) fn get_float_to_float_method() -> errors::Result<jmethodID> {`
	`2125`	`+pub(crate) unsafe fn get_float_to_float_method() -> errors::Result<jmethodID> {`
`2126`	`2126`	`get_cached!(`
`2127`	`2127`	`FLOAT_TO_FLOAT_METHOD,`
`2128`	`2128`	`{`
`@@ -2174,7 +2174,7 @@ pub(crate) fn set_double_constructor_method(j: jmethodID) {`
`2174`	`2174`	`}`
`2175`	`2175`
`2176`	`2176`	`#[allow(dead_code)]`
`2177`		`-pub(crate) fn get_double_constructor_method() -> errors::Result<jmethodID> {`
	`2177`	`+pub(crate) unsafe fn get_double_constructor_method() -> errors::Result<jmethodID> {`
`2178`	`2178`	`get_cached!(`
`2179`	`2179`	`DOUBLE_CONSTRUCTOR_METHOD,`
`2180`	`2180`	`{`
`@@ -2204,7 +2204,7 @@ pub(crate) fn set_double_to_double_method(j: jmethodID) {`
`2204`	`2204`	`}`
`2205`	`2205`
`2206`	`2206`	`#[allow(dead_code)]`
`2207`		`-pub(crate) fn get_double_to_double_method() -> errors::Result<jmethodID> {`
	`2207`	`+pub(crate) unsafe fn get_double_to_double_method() -> errors::Result<jmethodID> {`
`2208`	`2208`	`get_cached!(`
`2209`	`2209`	`DOUBLE_TO_DOUBLE_METHOD,`
`2210`	`2210`	`{`
`@@ -2277,7 +2277,7 @@ pub(crate) fn set_get_classloader_method(j: jmethodID) {`
`2277`	`2277`	`}`
`2278`	`2278`
`2279`	`2279`	`#[cfg(target_os = "android")]`
`2280`		`-pub(crate) fn get_get_classloader_method() -> errors::Result<jmethodID> {`
	`2280`	`+pub(crate) unsafe fn get_get_classloader_method() -> errors::Result<jmethodID> {`
`2281`	`2281`	`get_cached!(`
`2282`	`2282`	`GET_CLASSLOADER_METHOD,`
`2283`	`2283`	`{`
`@@ -2304,7 +2304,7 @@ pub(crate) fn set_load_class_method(j: jmethodID) {`
`2304`	`2304`	`}`
`2305`	`2305`
`2306`	`2306`	`#[cfg(target_os = "android")]`
`2307`		`-pub(crate) fn get_load_class_method() -> errors::Result<jmethodID> {`
	`2307`	`+pub(crate) unsafe fn get_load_class_method() -> errors::Result<jmethodID> {`
`2308`	`2308`	`get_cached!(`
`2309`	`2309`	`GET_LOAD_CLASS_METHOD,`
`2310`	`2310`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ pub fn to_c_string_struct(string: &str) -> CString {`
`41`	`41`	`unsafe { CString::from_vec_unchecked(enc) }`
`42`	`42`	`}`
`43`	`43`
`44`		`-pub fn drop_c_string(ptr: *mut c_char) {`
`45`		`- let _ = unsafe { CString::from_raw(ptr) };`
	`44`	`+pub unsafe fn drop_c_string(ptr: *mut c_char) {`
	`45`	`+ let _ = CString::from_raw(ptr);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`#[cfg(not(target_os = "windows"))]`