mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-22 21:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: avoid double close when loop_add_io fails

Browse source
This commit is contained in:
Wim Taymans 2026-05-15 13:38:32 +02:00
parent 894e97aaa5
commit 250260e18e
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-avb/maap.c
View file

@ -379,9 +379,9 @@ struct avb_maap *avb_maap_register(struct server *server)
{ {
struct maap *maap; struct maap *maap;
uint8_t bmac[6] = AVB_MAAP_MAC; uint8_t bmac[6] = AVB_MAAP_MAC;
int fd, res; int res;
fd = avb_server_make_socket(server, AVB_TSN_ETH, bmac); spa_autoclose int fd = avb_server_make_socket(server, AVB_TSN_ETH, bmac);
if (fd < 0) { if (fd < 0) {
res = fd; res = fd;
goto error; goto error;
@ -390,7 +390,7 @@ struct avb_maap *avb_maap_register(struct server *server)
maap = calloc(1, sizeof(*maap)); maap = calloc(1, sizeof(*maap));
if (maap == NULL) { if (maap == NULL) {
res = -errno; res = -errno;
goto error_close; goto error;
} }
maap->props = pw_properties_new(NULL, NULL); maap->props = pw_properties_new(NULL, NULL);
if (maap->props == NULL) { if (maap->props == NULL) {
@ -405,7 +405,7 @@ struct avb_maap *avb_maap_register(struct server *server)
load_state(maap); load_state(maap);
maap->source = pw_loop_add_io(server->impl->loop, fd, SPA_IO_IN, true, on_socket_data, maap); maap->source = pw_loop_add_io(server->impl->loop, spa_steal_fd(fd), SPA_IO_IN, true, on_socket_data, maap);
if (maap->source == NULL) { if (maap->source == NULL) {
res = -errno; res = -errno;
pw_log_error("maap %p: can't create maap source: %m", maap); pw_log_error("maap %p: can't create maap source: %m", maap);
@ -417,8 +417,6 @@ struct avb_maap *avb_maap_register(struct server *server)
error_free: error_free:
free(maap); free(maap);
error_close:
close(fd);
error: error:
errno = -res; errno = -res;
return NULL; return NULL;