fdo-mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-06 13:48:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol-native: close fd and unset env in all cases

Browse source 
If we find the fd valid, we must attempt to close it.
Also unset the env variable when we read and processed it, even if
there was an error.
This commit is contained in:
Wim Taymans 2026-05-05 17:09:12 +02:00
parent aa6fa6bdc3
commit c2bf8c920e
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/modules/module-protocol-native.c
View file

@ -841,7 +841,7 @@ close_data(void *data, int fd, uint32_t mask)
static int write_socket_address(struct server *s)
{
long v;
int fd, res = 0;
int fd, res;
char *endptr;
const char *env = getenv("PIPEWIRE_NOTIFICATION_FD");
@ -855,24 +855,25 @@ static int write_socket_address(struct server *s)
if (errno != 0) {
res = -errno;
pw_log_error("server %p: strtol() failed with error: %m", s);
goto error;
goto exit;
}
fd = (int)v;
if (v != fd) {
if (fd < 0 || v != fd) {
res = -ERANGE;
pw_log_error("server %p: invalid fd %ld: %s", s, v, spa_strerror(res));
goto error;
goto exit;
}
if (dprintf(fd, "%s\n", s->addr.sun_path) < 0) {
res = -errno;
pw_log_error("server %p: dprintf() failed with error: %m", s);
goto error;
goto exit_close;
}
close(fd);
unsetenv("PIPEWIRE_NOTIFICATION_FD");
return 0;
res = 0;
error:
exit_close:
close(fd);
exit:
unsetenv("PIPEWIRE_NOTIFICATION_FD");
return res;
}