commit 8d798089c3ae33fa445a1fd7547f9b538a364954
author Tamir Duberstein <tamird@google.com> Mon Apr 12 15:01:29 2021 +0000
committer CQ Bot <commit-bot@chromium.org> Mon Apr 12 15:01:29 2021 +0000
tree 6eb404b8de3d6f7865ea7ba10aac8093b1bee9a9
parent f6a5cee2293bf2ea327fbd75b933e0e53cb0192e

[bsdsocket_test] Check length before value

Change-Id: Id6f3d8b5c72ff7abaff8b99bbaac3551fecf3c69
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/514163
Reviewed-by: Bruno Dal Bo <brunodalbo@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Fuchsia-Auto-Submit: Tamir Duberstein <tamird@google.com>

src/connectivity/network/tests/bsdsocket_test.cc

diff --git a/src/connectivity/network/tests/bsdsocket_test.cc b/src/connectivity/network/tests/bsdsocket_test.cc
index 362bcc7..33c1ad9 100644
--- a/src/connectivity/network/tests/bsdsocket_test.cc
+++ b/src/connectivity/network/tests/bsdsocket_test.cc
@@ -329,8 +329,8 @@
   socklen_t get_sz = sizeof(get);
   constexpr int kDefaultTTL = 64;
   EXPECT_EQ(getsockopt(s.get(), IPPROTO_IP, IP_TTL, &get, &get_sz), 0) << strerror(errno);
-  EXPECT_EQ(get, kDefaultTTL);
   EXPECT_EQ(get_sz, sizeof(get));
+  EXPECT_EQ(get, kDefaultTTL);
   EXPECT_EQ(close(s.release()), 0) << strerror(errno);
 }
 
@@ -1336,8 +1336,8 @@
   int err;
   socklen_t optlen = sizeof(err);
   ASSERT_EQ(getsockopt(conn.get(), SOL_SOCKET, SO_ERROR, &err, &optlen), 0) << strerror(errno);
-  ASSERT_EQ(err, ECONNRESET) << strerror(errno);
   ASSERT_EQ(optlen, sizeof(err));
+  ASSERT_EQ(err, ECONNRESET) << strerror(err);
 }
 
 TEST(LocalhostTest, ConnectAFMismatchINET) {
@@ -2138,8 +2138,8 @@
     int err;
     socklen_t optlen = sizeof(err);
     ASSERT_EQ(getsockopt(connfd.get(), SOL_SOCKET, SO_ERROR, &err, &optlen), 0) << strerror(errno);
-    ASSERT_EQ(err, 0);
     ASSERT_EQ(optlen, sizeof(err));
+    ASSERT_EQ(err, 0) << strerror(err);
   }
 
   fbl::unique_fd clientfd;
@@ -2205,8 +2205,8 @@
     int err;
     socklen_t optlen = sizeof(err);
     ASSERT_EQ(getsockopt(connfd.get(), SOL_SOCKET, SO_ERROR, &err, &optlen), 0) << strerror(errno);
-    ASSERT_EQ(err, 0);
     ASSERT_EQ(optlen, sizeof(err));
+    ASSERT_EQ(err, 0) << strerror(err);
 
     char buf[sizeof(msg) + 1] = {};
     ASSERT_EQ(read(connfd.get(), buf, sizeof(buf)), ssize_t(sizeof(msg))) << strerror(errno);
@@ -3053,8 +3053,8 @@
     int err;
     socklen_t optlen = sizeof(err);
     ASSERT_EQ(getsockopt(connfd.get(), SOL_SOCKET, SO_ERROR, &err, &optlen), 0) << strerror(errno);
-    ASSERT_EQ(err, ECONNREFUSED);
     ASSERT_EQ(optlen, sizeof(err));
+    ASSERT_EQ(err, ECONNREFUSED) << strerror(err);
   }
 
   EXPECT_EQ(close(connfd.release()), 0) << strerror(errno);
@@ -4324,6 +4324,7 @@
   int opt;
   socklen_t optlen = sizeof(opt);
   EXPECT_EQ(getsockopt(fd.get(), SOL_SOCKET, SO_PROTOCOL, &opt, &optlen), 0) << strerror(errno);
+  EXPECT_EQ(optlen, sizeof(opt));
   EXPECT_EQ(opt, protocol);
 }