Skip to content

Commit 91b81c6

Browse files
authored
Merge pull request #9905 from michalpasztamobica/test_recv_return_less_or_equal
Tests: check if recv returned too much data
2 parents cde7d0b + c81f71b commit 91b81c6

File tree

5 files changed

+11
-0
lines changed

5 files changed

+11
-0
lines changed

TESTS/netsocket/tcp/tcpsocket_echotest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ void TCPSOCKET_ECHOTEST()
8686
TEST_FAIL();
8787
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
8888
return;
89+
} else if (recvd > bytes2recv) {
90+
TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
8991
}
9092
bytes2recv -= recvd;
9193
}

TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ void TCPSOCKET_ECHOTEST_BURST()
7373
if (recvd < 0) {
7474
printf("[%02d] network error %d\n", i, recvd);
7575
break;
76+
} else if (recvd > bt_left) {
77+
TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
7678
}
7779
bt_left -= recvd;
7880
}

TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ void rcv_n_chk_against_rfc864_pattern_nonblock(TCPSocket &sock)
145145
int rd = sock.recv(buff, buff_size);
146146
TEST_ASSERT(rd > 0 || rd == NSAPI_ERROR_WOULD_BLOCK);
147147
if (rd > 0) {
148+
if (rd > buff_size) {
149+
TEST_FAIL_MESSAGE("sock.recv returned more than requested.");
150+
}
148151
check_RFC_864_pattern(buff, rd, recvd_size);
149152
recvd_size += rd;
150153
} else if (rd == NSAPI_ERROR_WOULD_BLOCK) {

TESTS/netsocket/tls/tlssocket_echotest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ void TLSSOCKET_ECHOTEST()
9191
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
9292
delete sock;
9393
return;
94+
} else if (recvd > bytes2recv) {
95+
TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
9496
}
9597
bytes2recv -= recvd;
9698
}

TESTS/netsocket/tls/tlssocket_echotest_burst.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ void TLSSOCKET_ECHOTEST_BURST()
7575
if (recvd < 0) {
7676
printf("[%02d] network error %d\n", i, recvd);
7777
break;
78+
} else if (recvd > bt_left) {
79+
TEST_FAIL_MESSAGE("sock.recv returned more bytes than requested");
7880
}
7981
bt_left -= recvd;
8082
}

0 commit comments

Comments
 (0)