diff --git a/src/modules/module-netjack2/peer.c b/src/modules/module-netjack2/peer.c
index b289c9425..3bbb8d47a 100644
--- a/src/modules/module-netjack2/peer.c
+++ b/src/modules/module-netjack2/peer.c
@@ -815,6 +815,8 @@ static int netjack2_recv_midi(struct netjack2_peer *peer, struct nj2_packet_head
 
 	if ((len = recv(peer->fd, buffer, packet_size, 0)) < 0)
 		return -errno;
+	if ((size_t)len < sizeof(*header))
+		return -EINVAL;
 
 	active_ports = peer->params.recv_midi_channels;
 	if (active_ports == 0)
diff --git a/src/modules/module-protocol-simple.c b/src/modules/module-protocol-simple.c
index bbed3b5f7..6fdef15b8 100644
--- a/src/modules/module-protocol-simple.c
+++ b/src/modules/module-protocol-simple.c
@@ -665,8 +665,9 @@ static int make_tcp_socket(struct server *server, const char *name, const char *
 		const char *ifaddress)
 {
 	struct sockaddr_storage addr;
-	int res, fd, on;
+	int res, on;
 	socklen_t len = 0;
+	spa_autoclose int fd = -1;
 
 	if ((res = pw_net_parse_address_port(name, ifaddress, DEFAULT_PORT, &addr, &len)) < 0) {
 		pw_log_error("%p: can't parse address %s: %s", server,
@@ -693,26 +694,24 @@ static int make_tcp_socket(struct server *server, const char *name, const char *
 	if (bind(fd, (struct sockaddr *) &addr, len) < 0) {
 		res = -errno;
 		pw_log_error("%p: bind() failed: %m", server);
-		goto error_close;
+		goto error;
 	}
 	if (listen(fd, 5) < 0) {
 		res = -errno;
 		pw_log_error("%p: listen() failed: %m", server);
-		goto error_close;
+		goto error;
 	}
 	if (getsockname(fd, (struct sockaddr *)&addr, &len) < 0) {
 		res = -errno;
 		pw_log_error("%p: getsockname() failed: %m", server);
-		goto error_close;
+		goto error;
 	}
 
 	server->type = SERVER_TYPE_TCP;
 	server->addr = addr;
 
-	return fd;
+	return spa_steal_fd(fd);
 
-error_close:
-	close(fd);
 error:
 	return res;
 }
diff --git a/src/modules/module-rtp-sap.c b/src/modules/module-rtp-sap.c
index dc01cb987..3fa69ef74 100644
--- a/src/modules/module-rtp-sap.c
+++ b/src/modules/module-rtp-sap.c
@@ -1478,6 +1478,8 @@ static int parse_sdp(struct impl *impl, char *sdp, struct sdp_info *info)
 	int count = 0, res = 0;
 	size_t l;
 
+	spa_zero(*info);
+
 	while (*s) {
 		if ((l = strcspn(s, "\r\n")) < 2)
 			goto too_short;
@@ -1523,12 +1525,15 @@ static int parse_sdp(struct impl *impl, char *sdp, struct sdp_info *info)
 	return 0;
 too_short:
 	pw_log_warn("SDP: line starting with `%.6s...' too short", s);
+	clear_sdp_info(info);
 	return -EINVAL;
 invalid_version:
 	pw_log_warn("SDP: invalid first version line `%*s'", (int)l, s);
+	clear_sdp_info(info);
 	return -EINVAL;
 error:
 	pw_log_warn("SDP: error: %s", spa_strerror(res));
+	clear_sdp_info(info);
 	return res;
 }
 
@@ -1570,7 +1575,6 @@ static int parse_sap(struct impl *impl, void *data, size_t len)
 
 	pw_log_debug("got SAP: %s %s", mime, sdp);
 
-	spa_zero(info);
 	if ((res = parse_sdp(impl, sdp, &info)) < 0)
 		return res;