From 568501308d818e36efd13ac15d7f5d4bf40b93dc Mon Sep 17 00:00:00 2001 From: Misha Efimov Date: Mon, 29 Nov 2021 13:07:13 -0500 Subject: [PATCH 1/3] Remove wrong ASSERT from MockOsSysCalls::setsockopt(). Signed-off-by: Misha Efimov --- test/mocks/api/mocks.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/mocks/api/mocks.cc b/test/mocks/api/mocks.cc index c3eeed40d0c5c..65f4ebb3ae4fe 100644 --- a/test/mocks/api/mocks.cc +++ b/test/mocks/api/mocks.cc @@ -60,8 +60,6 @@ MockOsSysCalls::~MockOsSysCalls() = default; SysCallIntResult MockOsSysCalls::setsockopt(os_fd_t sockfd, int level, int optname, const void* optval, socklen_t optlen) { - ASSERT(optlen == sizeof(int)); - // Allow mocking system call failure. if (setsockopt_(sockfd, level, optname, optval, optlen) != 0) { return SysCallIntResult{-1, 0}; From 63e95898769ca00613ad95545cf87e29023a6ed2 Mon Sep 17 00:00:00 2001 From: Misha Efimov Date: Mon, 29 Nov 2021 13:42:22 -0500 Subject: [PATCH 2/3] Added a condition. Signed-off-by: Misha Efimov --- test/mocks/api/mocks.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/mocks/api/mocks.cc b/test/mocks/api/mocks.cc index 65f4ebb3ae4fe..6a396cd4e064c 100644 --- a/test/mocks/api/mocks.cc +++ b/test/mocks/api/mocks.cc @@ -65,7 +65,9 @@ SysCallIntResult MockOsSysCalls::setsockopt(os_fd_t sockfd, int level, int optna return SysCallIntResult{-1, 0}; } - boolsockopts_[SockOptKey(sockfd, level, optname)] = !!*reinterpret_cast(optval); + if (optlen >= sizeof(int)) { + boolsockopts_[SockOptKey(sockfd, level, optname)] = !!*reinterpret_cast(optval); + } return SysCallIntResult{0, 0}; }; From df0ae77aed067be732271b07b114ffe5a6d185f3 Mon Sep 17 00:00:00 2001 From: Misha Efimov Date: Tue, 30 Nov 2021 09:22:45 -0500 Subject: [PATCH 3/3] Kick CI Signed-off-by: Misha Efimov