Merge branch 'master' into comment

1 files changed, 2 insertions, 1 deletions

diff --git a/io.c b/io.c
index 59ddd115..e0632d8b 100644
--- a/io.c
+++ b/io.c
@@ -1463,7 +1463,7 @@ socketopen(int family, int type, const char *localpname,
 #ifdef MSG_PEEK
 					char buf[10];
 					struct sockaddr_storage remote_addr;
-					socklen_t read_len;
+					socklen_t read_len = 0;
 
 					if (recvfrom(socket_fd, buf, 1, MSG_PEEK,
 						(struct sockaddr *) & remote_addr,
@@ -1915,6 +1915,7 @@ two_way_open(const char *str, struct redirect *rp)
 		case -1:
 			save_errno = errno;
 			close(master);
+			close(slave);
 			errno = save_errno;
 			return false;