svn commit: r353564 - stable/12/tests/sys/kern

Mark Johnston markj at FreeBSD.org
Tue Oct 15 14:51:23 UTC 2019


Author: markj
Date: Tue Oct 15 14:51:22 2019
New Revision: 353564
URL: https://svnweb.freebsd.org/changeset/base/353564

Log:
  MFC r353333:
  Fix a bug in r353332 that snuck in with a last-minute adjustment.

Modified:
  stable/12/tests/sys/kern/unix_passfd_test.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/tests/sys/kern/unix_passfd_test.c
==============================================================================
--- stable/12/tests/sys/kern/unix_passfd_test.c	Tue Oct 15 14:48:00 2019	(r353563)
+++ stable/12/tests/sys/kern/unix_passfd_test.c	Tue Oct 15 14:51:22 2019	(r353564)
@@ -659,7 +659,7 @@ ATF_TC_BODY(empty_rights_message, tc)
 	len = recvmsg(fd[1], &msghdr, 0);
 	ATF_REQUIRE_MSG(len == 0, "recvmsg failed: %s", strerror(errno));
 	ATF_REQUIRE(msghdr.msg_controllen = CMSG_SPACE(sizeof(int)));
-	error = close((int *)CMSG_DATA(msghdr.msg_control));
+	error = close(*(int *)CMSG_DATA(msghdr.msg_control));
 	ATF_REQUIRE_MSG(error == 0, "close failed: %s", strerror(errno));
 
 	/*
@@ -685,7 +685,7 @@ ATF_TC_BODY(empty_rights_message, tc)
 	len = recvmsg(fd[1], &msghdr, 0);
 	ATF_REQUIRE_MSG(len == 0, "recvmsg failed: %s", strerror(errno));
 	ATF_REQUIRE(msghdr.msg_controllen = CMSG_SPACE(sizeof(int)));
-	error = close((int *)CMSG_DATA(msghdr.msg_control));
+	error = close(*(int *)CMSG_DATA(msghdr.msg_control));
 	ATF_REQUIRE_MSG(error == 0, "close failed: %s", strerror(errno));
 
 	(void)close(putfd);


More information about the svn-src-all mailing list