Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ed5462 authored by Andrew Walbran's avatar Andrew Walbran Committed by Automerger Merge Worker
Browse files

Merge "Add safety comments." into main am: dcac88ce am: 383ff05e 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2651895



Change-Id: I3af7e8e9e3b3be90d2903f891e4b029576244c20
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 284dc1d3 383ff05e

debuggerd/rust/tombstoned_client/src/lib.rs

+12 −6
Original line number Diff line number Diff line
@@ -39,20 +39,26 @@ pub struct TombstonedConnection { 
}



impl TombstonedConnection {

    /// # Safety

    ///

    /// The file descriptors must be valid and open.

    unsafe fn from_raw_fds(

        tombstoned_socket: RawFd,

        text_output_fd: RawFd,

        proto_output_fd: RawFd,

    ) -> Self {

        Self {

            tombstoned_socket: File::from_raw_fd(tombstoned_socket),

            // SAFETY: The caller guarantees that the file descriptor is valid and open.

            tombstoned_socket: unsafe { File::from_raw_fd(tombstoned_socket) },

            text_output: if text_output_fd >= 0 {

                Some(File::from_raw_fd(text_output_fd))

                // SAFETY: The caller guarantees that the file descriptor is valid and open.

                Some(unsafe { File::from_raw_fd(text_output_fd) })

            } else {

                None

            },

            proto_output: if proto_output_fd >= 0 {

                Some(File::from_raw_fd(proto_output_fd))

                // SAFETY: The caller guarantees that the file descriptor is valid and open.

                Some(unsafe { File::from_raw_fd(proto_output_fd) })

            } else {

                None

            },
@@ -71,6 +77,8 @@ impl TombstonedConnection { 
            &mut proto_output_fd,

            dump_type,

        ) {

            // SAFETY: If tombstoned_connect_files returns successfully then they file descriptors

            // are valid and open.

            Ok(unsafe { Self::from_raw_fds(tombstoned_socket, text_output_fd, proto_output_fd) })

        } else {

            Err(Error)
@@ -146,8 +154,6 @@ mod tests { 
            .write_all(b"test data")

            .expect("Failed to write to text output FD.");



        connection

            .notify_completion()

            .expect("Failed to notify completion.");

        connection.notify_completion().expect("Failed to notify completion.");

    }

}