From 35533f4b968fc14b80a085e0246aa3074c1dec6f Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 3 Jan 2021 16:01:53 -0800 Subject: fixes #1403 http ws listeners added without a lock --- src/sp/transport/ws/ws_test.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/sp') diff --git a/src/sp/transport/ws/ws_test.c b/src/sp/transport/ws/ws_test.c index 7cbcd9d7..4a2b58c2 100644 --- a/src/sp/transport/ws/ws_test.c +++ b/src/sp/transport/ws/ws_test.c @@ -56,19 +56,16 @@ test_wild_card_port(void) NUTS_OPEN(s5); NUTS_OPEN(s6); NUTS_PASS(nng_listen(s1, "ws://127.0.0.1:0/one", &l1, 0)); - NUTS_PASS( - nng_listener_get_int(l1, NNG_OPT_TCP_BOUND_PORT, &port1)); + NUTS_PASS(nng_listener_get_int(l1, NNG_OPT_TCP_BOUND_PORT, &port1)); NUTS_TRUE(port1 != 0); snprintf(ws_url, sizeof(ws_url), "ws4://127.0.0.1:%d/two", port1); NUTS_PASS(nng_listen(s2, ws_url, &l2, 0)); - NUTS_PASS( - nng_listener_get_int(l2, NNG_OPT_TCP_BOUND_PORT, &port2)); + NUTS_PASS(nng_listener_get_int(l2, NNG_OPT_TCP_BOUND_PORT, &port2)); NUTS_TRUE(port1 != 0); NUTS_TRUE(port1 == port2); // Now try a different wild card port. NUTS_PASS(nng_listen(s3, "ws4://127.0.0.1:0/three", &l3, 0)); - NUTS_PASS( - nng_listener_get_int(l3, NNG_OPT_TCP_BOUND_PORT, &port3)); + NUTS_PASS(nng_listener_get_int(l3, NNG_OPT_TCP_BOUND_PORT, &port3)); NUTS_TRUE(port3 != 0); NUTS_TRUE(port3 != port1); @@ -147,7 +144,9 @@ test_ws_recv_max(void) nng_socket s1; nng_listener l; size_t sz; - char *addr; + char * addr; + + memset(msg, 0, sizeof(msg)); // required to silence valgrind NUTS_ADDR(addr, "ws"); NUTS_OPEN(s0); -- cgit v1.2.3-70-g09d2