generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavformat: Handle error return from ff_listen_bind

Browse Source 
Handle error return from ff_listen_bind without leaking file descriptors.

Signed-off-by: Anders Nystrom <anders.nystrom@southpole.se>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Anders Nystrom 2015-04-09 02:38:41 +02:00 committed by Luca Barbato
parent 0266988ccd
commit 27852f2f1d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/tcp.c
View File

@ -114,11 +114,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
} }
if (s->listen) { if (s->listen) {
if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, if ((ret = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
s->listen_timeout, h)) < 0) { s->listen_timeout, h)) < 0) {
ret = fd;
goto fail1; goto fail1;
} }
fd = ret;
} else { } else {
if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
s->timeout, h, !!cur_ai->ai_next)) < 0) { s->timeout, h, !!cur_ai->ai_next)) < 0) {

9
libavformat/unix.c
View File

@ -75,12 +75,11 @@ static int unix_open(URLContext *h, const char *filename, int flags)
return ff_neterrno(); return ff_neterrno();
if (s->listen) { if (s->listen) {
fd = ff_listen_bind(fd, (struct sockaddr *)&s->addr, ret = ff_listen_bind(fd, (struct sockaddr *)&s->addr,
sizeof(s->addr), s->timeout, h); sizeof(s->addr), s->timeout, h);
if (fd < 0) { if (ret < 0)
ret = fd;
goto fail; goto fail;
} fd = ret;
} else { } else {
ret = ff_listen_connect(fd, (struct sockaddr *)&s->addr, ret = ff_listen_connect(fd, (struct sockaddr *)&s->addr,
sizeof(s->addr), s->timeout, h, 0); sizeof(s->addr), s->timeout, h, 0);