1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inspector, test: Fix test bug detected by Coverity

Browse Source 
Error value was not checked. Turns out, uv_ip6_addr was actually called
on malformed IP (square brackets should not have been included).

PR-URL: https://github.com/nodejs/node/pull/13799
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Eugene Ostroukhov 2017-06-19 10:37:27 -07:00
parent 32c7f114c5
commit 3d0ef56264
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/cctest/test_inspector_socket_server.cc
View File

@ -172,12 +172,14 @@ class SocketWrapper {
contents_.clear(); contents_.clear();
uv_tcp_init(loop_, &socket_); uv_tcp_init(loop_, &socket_);
union {sockaddr generic; sockaddr_in v4; sockaddr_in6 v6;} addr; union {sockaddr generic; sockaddr_in v4; sockaddr_in6 v6;} addr;
int err = 0;
if (v6) { if (v6) {
uv_ip6_addr(host.c_str(), port, &addr.v6); err = uv_ip6_addr(host.c_str(), port, &addr.v6);
} else { } else {
uv_ip4_addr(host.c_str(), port, &addr.v4); err = uv_ip4_addr(host.c_str(), port, &addr.v4);
} }
int err = uv_tcp_connect(&connect_, &socket_, &addr.generic, Connected_); ASSERT_EQ(0, err);
err = uv_tcp_connect(&connect_, &socket_, &addr.generic, Connected_);
ASSERT_EQ(0, err); ASSERT_EQ(0, err);
SPIN_WHILE(!connected_) SPIN_WHILE(!connected_)
uv_read_start(reinterpret_cast<uv_stream_t*>(&socket_), AllocCallback, uv_read_start(reinterpret_cast<uv_stream_t*>(&socket_), AllocCallback,
@ -618,7 +620,7 @@ TEST_F(InspectorSocketServerTest, BindsToIpV6) {
ASSERT_TRUE(server->Start()); ASSERT_TRUE(server->Start());
SocketWrapper socket1(&loop); SocketWrapper socket1(&loop);
socket1.Connect("[::]", server.port(), true); socket1.Connect("::", server.port(), true);
socket1.Write(WsHandshakeRequest(MAIN_TARGET_ID)); socket1.Write(WsHandshakeRequest(MAIN_TARGET_ID));
socket1.Expect(WS_HANDSHAKE_RESPONSE); socket1.Expect(WS_HANDSHAKE_RESPONSE);
server->Stop(ServerHolder::CloseCallback); server->Stop(ServerHolder::CloseCallback);