mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-rtp-sap: fix fd leak

Browse source
This commit is contained in:
Dmitry Sharshakov 2024-01-20 17:00:52 +03:00 • committed by Wim Taymans
parent 401df6e199
commit 9a0499b64d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-rtp-sap.c
View file

@ -16,6 +16,7 @@
#include <net/if.h>
#include <ctype.h>
#include <spa/utils/cleanup.h>
#include <spa/utils/hook.h>
#include <spa/utils/result.h>
#include <spa/utils/json.h>
@ -386,10 +387,9 @@ static bool is_multicast(struct sockaddr *sa, socklen_t salen)
static int make_unix_socket(char *path, char *client_path) {
struct sockaddr_un client_addr, server_addr;
int fd;
fd = socket(AF_UNIX, SOCK_DGRAM, 0);
if (fd == -1) {
spa_autoclose int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
if (fd < 0) {
pw_log_warn("Failed to create PTP management socket");
return -1;
}
@ -398,7 +398,7 @@ static int make_unix_socket(char *path, char *client_path) {
client_addr.sun_family = AF_UNIX;
strncpy(client_addr.sun_path, client_path, strlen(client_path));
if (bind(fd, (struct sockaddr *)&client_addr, sizeof(client_addr)) == -1) {
if (bind(fd, (struct sockaddr *)&client_addr, sizeof(client_addr)) < 0) {
pw_log_warn("Failed to bind PTP management socket");
return -1;
}
@ -407,12 +407,12 @@ static int make_unix_socket(char *path, char *client_path) {
server_addr.sun_family = AF_UNIX;
strncpy(server_addr.sun_path, path, sizeof(server_addr.sun_path) - 1);
if (connect(fd, (struct sockaddr*)&server_addr, sizeof(server_addr)) == -1) {
if (connect(fd, (struct sockaddr*)&server_addr, sizeof(server_addr)) < 0) {
pw_log_warn("Failed to connect PTP management socket");
return -1;
}
return fd;
return spa_steal_fd(fd);
}
static int make_send_socket(