From 9a168e9371d6fbd69c9a88d5573a5ade095efaaf Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Fri, 11 Sep 2015 14:53:09 -0700 Subject: [PATCH] ffserver: unify fail path in socket_open_listen() Signed-off-by: Reynaldo H. Verdejo Pinochet --- ffserver.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ffserver.c b/ffserver.c index 8b6e441513..2a5bc92d5d 100644 --- a/ffserver.c +++ b/ffserver.c @@ -470,20 +470,22 @@ static int socket_open_listen(struct sockaddr_in *my_addr) snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port)); perror (bindmsg); - closesocket(server_fd); - return -1; + goto fail; } if (listen (server_fd, 5) < 0) { perror ("listen"); - closesocket(server_fd); - return -1; + goto fail; } if (ff_socket_nonblock(server_fd, 1) < 0) av_log(NULL, AV_LOG_WARNING, "ff_socket_nonblock failed\n"); return server_fd; + +fail: + closesocket(server_fd); + return -1; } /* start all multicast streams */