Commit 1e919423 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

cr_page_server(): avoid using uninit variable

In case opts.ps_socket is set (see commit 7058714f),
we don't call accept() and so the peer address (caddr)
is left uninitialized, but we try to print it.

Fix by moving the printing code to right after accept().

Reported by Coverity, CID 51645.
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 2403ee46
...@@ -354,17 +354,15 @@ no_server: ...@@ -354,17 +354,15 @@ no_server:
ret = ask = accept(sk, (struct sockaddr *)&caddr, &clen); ret = ask = accept(sk, (struct sockaddr *)&caddr, &clen);
if (ask < 0) if (ask < 0)
pr_perror("Can't accept connection to server"); pr_perror("Can't accept connection to server");
else
pr_info("Accepted connection from %s:%u\n",
inet_ntoa(caddr.sin_addr),
(int)ntohs(caddr.sin_port));
close(sk); close(sk);
} }
if (ask >= 0) { if (ask >= 0)
pr_info("Accepted connection from %s:%u\n",
inet_ntoa(caddr.sin_addr),
(int)ntohs(caddr.sin_port));
ret = page_server_serve(ask); ret = page_server_serve(ask);
}
if (daemon_mode) if (daemon_mode)
exit(ret); exit(ret);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment