Skip to content

Commit

Permalink
Merge pull request nix-rust#2095 from asomers/recvmsg-lifetime
Browse files Browse the repository at this point in the history
Fix an incorrect lifetime in the return value of recvmsg
  • Loading branch information
asomers committed Aug 27, 2023
1 parent e9f5126 commit a40620c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/sys/socket/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2051,7 +2051,7 @@ fn pack_mhdr_to_send<'a, I, C, S>(
/// [recvmsg(2)](https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html)
pub fn recvmsg<'a, 'outer, 'inner, S>(fd: RawFd, iov: &'outer mut [IoSliceMut<'inner>],
mut cmsg_buffer: Option<&'a mut Vec<u8>>,
flags: MsgFlags) -> Result<RecvMsg<'a, 'inner, S>>
flags: MsgFlags) -> Result<RecvMsg<'a, 'outer, S>>
where S: SockaddrLike + 'a,
'inner: 'outer
{
Expand Down
10 changes: 3 additions & 7 deletions test/sys/test_socket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,9 @@ pub fn test_recvmsg_sockaddr_un() {

// Receive the message
let mut recv_buffer = [0u8; 32];
let received = socket::recvmsg(
sock,
&mut [std::io::IoSliceMut::new(&mut recv_buffer)],
None,
MsgFlags::empty(),
)
.unwrap();
let mut iov = [std::io::IoSliceMut::new(&mut recv_buffer)];
let received =
socket::recvmsg(sock, &mut iov, None, MsgFlags::empty()).unwrap();
// Check the address in the received message
assert_eq!(sockaddr, received.address.unwrap());
}
Expand Down

0 comments on commit a40620c

Please sign in to comment.