diff options
| author | Simon Rettberg | 2015-12-10 15:36:19 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-12-10 15:36:19 +0100 |
| commit | 0132aa1d53aefd99a27b2bd241ca45eea34dd115 (patch) | |
| tree | f908f343f638972dcb2ee24a94e9b37c41c43f34 /src/fuse | |
| parent | [FUSE] Fix stack overflow caused by stats data (diff) | |
| download | dnbd3-0132aa1d53aefd99a27b2bd241ca45eea34dd115.tar.gz dnbd3-0132aa1d53aefd99a27b2bd241ca45eea34dd115.tar.xz dnbd3-0132aa1d53aefd99a27b2bd241ca45eea34dd115.zip | |
[FUSE] Make valgrind happy by initializing memory and not calling close() on -1
Diffstat (limited to 'src/fuse')
| -rw-r--r-- | src/fuse/connection.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fuse/connection.c b/src/fuse/connection.c index 662ef3b..8b0cdd1 100644 --- a/src/fuse/connection.c +++ b/src/fuse/connection.c @@ -370,7 +370,7 @@ static void* connection_backgroundThread(void *something UNUSED) dnbd3_request_t request; request.magic = dnbd3_packet_magic; request.cmd = CMD_KEEPALIVE; - request.size = 0; + request.handle = request.offset = request.size = 0; fixup_request( request ); ssize_t ret = sock_sendAll( connection.sockFd, &request, sizeof request, 2 ); if ( (size_t)ret != sizeof request ) { @@ -510,7 +510,9 @@ static void probeAltServers() // Keep socket open if this is currently the best one if ( bestIndex == -1 || altservers[bestIndex].rtt > srv->rtt ) { bestIndex = altIndex; - close( bestSock ); + if ( bestSock != -1 ) { + close( bestSock ); + } bestSock = sock; } else { close( sock ); |