aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2021-02-11 20:57:48 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2021-02-11 20:57:48 +0000
commit5aa333e79b9892af9bf9621435d52cd058544d18 (patch)
tree5622eb61281866ec76db6e5c3d40eab8fcff9d46
parent89d82f69458f8c54a3b67a97ee8cd66fce14bf18 (diff)
parent9c2b47143a9f9b35a986619c800e7b23bd2ef80b (diff)
downloadslirp-5aa333e79b9892af9bf9621435d52cd058544d18.zip
slirp-5aa333e79b9892af9bf9621435d52cd058544d18.tar.gz
slirp-5aa333e79b9892af9bf9621435d52cd058544d18.tar.bz2
Merge branch 'memset-sizeof' into 'master'
tcpx_listen: Pass sizeof(addr) to memset See merge request slirp/libslirp!65
-rw-r--r--src/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/socket.c b/src/socket.c
index 4979f09..30fc8b8 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -744,7 +744,7 @@ static struct socket *tcpx_listen(Slirp *slirp, int family,
union slirp_sockaddr addr;
struct socket *so;
int s, opt = 1;
- socklen_t addrlen = sizeof(addr);
+ socklen_t addrlen;
DEBUG_CALL("tcpx_listen");
/* AF_INET6 addresses are bigger than AF_INET, so this is big enough. */
@@ -786,7 +786,7 @@ static struct socket *tcpx_listen(Slirp *slirp, int family,
so->so_lport6 = lport;
}
- memset(&addr, 0, addrlen);
+ memset(&addr, 0, sizeof(addr));
if (family == AF_INET) {
addr.sin.sin_family = family;
addr.sin.sin_addr = haddr.addr4;