mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aserver: fix resource leak coverity

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-05-24 10:27:25 +02:00
parent fe7ff721a9
commit 47bc6d5341
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
aserver/aserver.c
View file

@ -75,6 +75,7 @@ static int make_local_socket(const char *filename)
if (bind(sock, (struct sockaddr *) addr, size) < 0) { if (bind(sock, (struct sockaddr *) addr, size) < 0) {
int result = -errno; int result = -errno;
SYSERROR("bind failed"); SYSERROR("bind failed");
close(sock);
return result; return result;
} }
@ -101,6 +102,7 @@ static int make_inet_socket(int port)
if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) { if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
int result = -errno; int result = -errno;
SYSERROR("bind failed"); SYSERROR("bind failed");
close(sock);
return result; return result;
} }
@ -916,10 +918,9 @@ static int inet_handler(waiter_t *waiter, unsigned short events ATTRIBUTE_UNUSED
static int server(const char *sockname, int port) static int server(const char *sockname, int port)
{ {
int err; int err, result, sockn = -1, socki = -1;
unsigned int k; unsigned int k;
long open_max; long open_max;
int result;
if (!sockname && port < 0) if (!sockname && port < 0)
return -EINVAL; return -EINVAL;
@ -933,36 +934,36 @@ static int server(const char *sockname, int port)
waiters = calloc((size_t) open_max, sizeof(*waiters)); waiters = calloc((size_t) open_max, sizeof(*waiters));
if (sockname) { if (sockname) {
int sock = make_local_socket(sockname); sockn = make_local_socket(sockname);
if (sock < 0) if (sockn < 0)
return sock; return sockn;
if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(sockn, F_SETFL, O_NONBLOCK) < 0) {
result = -errno; result = -errno;
SYSERROR("fcntl O_NONBLOCK failed"); SYSERROR("fcntl O_NONBLOCK failed");
goto _end; goto _end;
} }
if (listen(sock, 4) < 0) { if (listen(sockn, 4) < 0) {
result = -errno; result = -errno;
SYSERROR("listen failed"); SYSERROR("listen failed");
goto _end; goto _end;
} }
add_waiter(sock, POLLIN, local_handler, NULL); add_waiter(sockn, POLLIN, local_handler, NULL);
} }
if (port >= 0) { if (port >= 0) {
int sock = make_inet_socket(port); socki = make_inet_socket(port);
if (sock < 0) if (socki < 0)
return sock; return socki;
if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(socki, F_SETFL, O_NONBLOCK) < 0) {
result = -errno; result = -errno;
SYSERROR("fcntl failed"); SYSERROR("fcntl failed");
goto _end; goto _end;
} }
if (listen(sock, 4) < 0) { if (listen(socki, 4) < 0) {
result = -errno; result = -errno;
SYSERROR("listen failed"); SYSERROR("listen failed");
goto _end; goto _end;
} }
add_waiter(sock, POLLIN, inet_handler, NULL); add_waiter(socki, POLLIN, inet_handler, NULL);
} }
while (1) { while (1) {
@ -991,6 +992,10 @@ static int server(const char *sockname, int port)
} }
} }
_end: _end:
if (sockn >= 0)
close(sockn);
if (socki >= 0)
close(socki);
free(pollfds); free(pollfds);
free(waiters); free(waiters);
return result; return result;