Make Socket:from_fd use an OwnedFd

Author: A6GibKm

gio/src/socket.rs

@@ -1,7 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 #[cfg(unix)]
-use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
 #[cfg(windows)]
 use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
 #[cfg(feature = "v2_60")]
@@ -18,15 +18,18 @@ use crate::{ffi, Cancellable, Socket, SocketAddress, SocketControlMessage};
 impl Socket {
     #[cfg(unix)]
     #[cfg_attr(docsrs, doc(cfg(unix)))]
-    #[allow(clippy::missing_safety_doc)]
-    pub unsafe fn from_fd(fd: impl IntoRawFd) -> Result<Socket, glib::Error> {
+    #[doc(alias = "g_socket_new_from_fd")]
+    pub fn from_fd(fd: OwnedFd) -> Result<Socket, glib::Error> {
         let fd = fd.into_raw_fd();
         let mut error = ptr::null_mut();
-        let ret = ffi::g_socket_new_from_fd(fd, &mut error);
-        if error.is_null() {
-            Ok(from_glib_full(ret))
-        } else {
-            Err(from_glib_full(error))
+        unsafe {
+            let ret = ffi::g_socket_new_from_fd(fd, &mut error);
+            if error.is_null() {
+                Ok(from_glib_full(ret))
+            } else {
+                libc::close(fd);
+                Err(from_glib_full(error))
+            }
         }
     }
     #[cfg(windows)]
@@ -801,7 +804,10 @@ mod tests {
     #[test]
     #[cfg(unix)]
     fn socket_messages() {
-        use std::{io, os::unix::io::AsRawFd};
+        use std::{
+            io,
+            os::unix::io::{AsRawFd, FromRawFd, OwnedFd},
+        };
 
         use super::Socket;
         use crate::{prelude::*, Cancellable, UnixFDMessage};
@@ -813,8 +819,8 @@ mod tests {
                 panic!("{}", io::Error::last_os_error());
             }
             (
-                Socket::from_fd(fds[0]).unwrap(),
-                Socket::from_fd(fds[1]).unwrap(),
+                Socket::from_fd(OwnedFd::from_raw_fd(fds[0])).unwrap(),
+                Socket::from_fd(OwnedFd::from_raw_fd(fds[1])).unwrap(),
             )
         };
 

gio/tests/dbus_peer.rs

@@ -8,7 +8,7 @@ fn test_gdbus_peer_connection() {
         prelude::*,
         DBusConnection, DBusConnectionFlags, DBusNodeInfo, Socket,
     };
-    use std::os::{fd::IntoRawFd, unix::net::UnixStream};
+    use std::os::unix::net::UnixStream;
 
     const EXAMPLE_XML: &str = r#"
   <node>
@@ -23,7 +23,7 @@ fn test_gdbus_peer_connection() {
 "#;
 
     pub async fn spawn_server(fd: UnixStream) -> DBusConnection {
-        let socket = unsafe { Socket::from_fd(fd.into_raw_fd()) }.unwrap();
+        let socket = Socket::from_fd(fd.into()).unwrap();
         let socket_connection = socket.connection_factory_create_connection();
 
         let guid = gio::dbus_generate_guid();
@@ -112,7 +112,7 @@ fn test_gdbus_peer_connection() {
     }
 
     pub async fn spawn_client(fd: UnixStream) -> DBusConnection {
-        let socket_client = unsafe { Socket::from_fd(fd.into_raw_fd()) }.unwrap();
+        let socket_client = Socket::from_fd(fd.into()).unwrap();
         let socket_connection_client = socket_client.connection_factory_create_connection();
 
         dbg!("client connecting");