diff options
| -rw-r--r-- | libavformat/tcp.c | 6 | ||||
| -rw-r--r-- | libavformat/unix.c | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 9585dc08d1..5badf4f438 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -114,11 +114,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags) } if (s->listen) { - if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, - s->listen_timeout, h)) < 0) { - ret = fd; + if ((ret = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, + s->listen_timeout, h)) < 0) { goto fail1; } + fd = ret; } else { if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, s->timeout, h, !!cur_ai->ai_next)) < 0) { diff --git a/libavformat/unix.c b/libavformat/unix.c index 5c6f576487..72b8fcdbbb 100644 --- a/libavformat/unix.c +++ b/libavformat/unix.c @@ -75,12 +75,11 @@ static int unix_open(URLContext *h, const char *filename, int flags) return ff_neterrno(); if (s->listen) { - fd = ff_listen_bind(fd, (struct sockaddr *)&s->addr, - sizeof(s->addr), s->timeout, h); - if (fd < 0) { - ret = fd; + ret = ff_listen_bind(fd, (struct sockaddr *)&s->addr, + sizeof(s->addr), s->timeout, h); + if (ret < 0) goto fail; - } + fd = ret; } else { ret = ff_listen_connect(fd, (struct sockaddr *)&s->addr, sizeof(s->addr), s->timeout, h, 0); |