StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix operation sequencing in TCP_test.

Browse Source 
The expression was fun(foo = bar, foo). The evaluation order is unspecified,
and often this will do the wrong thing. We should forbid side effects in
argument lists and conditionals.
This commit is contained in:
iphydf 2016-08-19 19:41:46 +01:00
parent bdf5ac37b4
commit 83d4857f08
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
auto_tests/TCP_test.c
View File

@ -106,9 +106,9 @@ START_TEST(test_basic)
do_TCP_server(tcp_s); do_TCP_server(tcp_s);
c_sleep(50); c_sleep(50);
uint8_t packet_resp[4096]; uint8_t packet_resp[4096];
int recv_data_len; int recv_data_len = recv(sock, packet_resp, 2 + 2 + crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES, 0);
ck_assert_msg((recv_data_len = recv(sock, packet_resp, 2 + 2 + crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES, ck_assert_msg(recv_data_len == 2 + 2 + crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES,
0)) == 2 + 2 + crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES, "recv Failed. %u", recv_data_len); "recv Failed. %u", recv_data_len);
memcpy(&size, packet_resp, 2); memcpy(&size, packet_resp, 2);
ck_assert_msg(ntohs(size) == 2 + crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES, "Wrong packet size."); ck_assert_msg(ntohs(size) == 2 + crypto_box_PUBLICKEYBYTES + crypto_box_MACBYTES, "Wrong packet size.");
uint8_t packet_resp_plain[4096]; uint8_t packet_resp_plain[4096];
@ -201,10 +201,10 @@ int write_packet_TCP_secure_connection(struct sec_TCP_con *con, uint8_t *data, u
int read_packet_sec_TCP(struct sec_TCP_con *con, uint8_t *data, uint16_t length) int read_packet_sec_TCP(struct sec_TCP_con *con, uint8_t *data, uint16_t length)
{ {
int len; int len = recv(con->sock, data, length, 0);
ck_assert_msg((len = recv(con->sock, data, length, 0)) == length, "wrong len %i\n", len); ck_assert_msg(len == length, "wrong len %i\n", len);
ck_assert_msg((len = decrypt_data_symmetric(con->shared_key, con->recv_nonce, data + 2, length - 2, data)) != -1, len = decrypt_data_symmetric(con->shared_key, con->recv_nonce, data + 2, length - 2, data);
"Decrypt failed"); ck_assert_msg(len != -1, "Decrypt failed");
increment_nonce(con->recv_nonce); increment_nonce(con->recv_nonce);
return len; return len;
} }