This is an automated email from the ASF dual-hosted git repository. yuanz pushed a commit to branch no-std in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
commit f1fcc453b4859ebb637a1e9b7ca143b7047fc00c Author: Sumit Garg <[email protected]> AuthorDate: Thu Nov 23 18:30:24 2023 +0530 optee-utee: Fix Box unused/drop warnings Drop Box corresponding to the handle which has been freed to avoid following warning: warning: unused return value of `Box::<T>::from_raw` that must be used Signed-off-by: Sumit Garg <[email protected]> --- optee-utee/src/crypto_op.rs | 2 +- optee-utee/src/object.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/optee-utee/src/crypto_op.rs b/optee-utee/src/crypto_op.rs index e7a9a62..4406717 100644 --- a/optee-utee/src/crypto_op.rs +++ b/optee-utee/src/crypto_op.rs @@ -247,7 +247,7 @@ impl Drop for OperationHandle { if self.raw != ptr::null_mut() { raw::TEE_FreeOperation(self.handle()); } - Box::from_raw(self.raw); + drop(Box::from_raw(self.raw)); } } } diff --git a/optee-utee/src/object.rs b/optee-utee/src/object.rs index 374af55..8cb4ddd 100644 --- a/optee-utee/src/object.rs +++ b/optee-utee/src/object.rs @@ -849,7 +849,7 @@ impl Drop for TransientObject { if self.0.raw != ptr::null_mut() { raw::TEE_FreeTransientObject(self.0.handle()); } - Box::from_raw(self.0.raw); + drop(Box::from_raw(self.0.raw)); } } } @@ -923,7 +923,7 @@ impl PersistentObject { } code => { unsafe { - Box::from_raw(raw_handle); + drop(Box::from_raw(raw_handle)); } Err(Error::from_raw_error(code)) } @@ -1011,7 +1011,7 @@ impl PersistentObject { } code => { unsafe { - Box::from_raw(raw_handle); + drop(Box::from_raw(raw_handle)); } Err(Error::from_raw_error(code)) } @@ -1054,7 +1054,7 @@ impl PersistentObject { match unsafe { raw::TEE_CloseAndDeletePersistentObject1(self.0.handle()) } { raw::TEE_SUCCESS => { unsafe { - Box::from_raw(self.0.raw); + drop(Box::from_raw(self.0.raw)); } return Ok(()); } @@ -1359,7 +1359,7 @@ impl Drop for PersistentObject { if self.0.raw != Box::into_raw(Box::new(ptr::null_mut())) { raw::TEE_CloseObject(self.0.handle()); } - Box::from_raw(self.0.raw); + drop(Box::from_raw(self.0.raw)); } } } @@ -1380,7 +1380,7 @@ impl ObjectEnumHandle { raw::TEE_SUCCESS => Ok(Self { raw: raw_handle }), code => { unsafe { - Box::from_raw(raw_handle); + drop(Box::from_raw(raw_handle)); } Err(Error::from_raw_error(code)) } @@ -1436,7 +1436,7 @@ impl Drop for ObjectEnumHandle { fn drop(&mut self) { unsafe { raw::TEE_FreePersistentObjectEnumerator(*self.raw); - Box::from_raw(self.raw); + drop(Box::from_raw(self.raw)); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
