From: Gustavo Sverzut Barbieri Date: Thu, 8 Dec 2016 20:54:43 +0000 (-0200) Subject: efl_net_socket_fd: do not close stdout if nothing was set. X-Git-Tag: upstream/1.20.0~2951 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fc0fbba42eaf331f69dbad0c507c1bf3d0cfc94;p=platform%2Fupstream%2Fefl.git efl_net_socket_fd: do not close stdout if nothing was set. if we create an object, say a TCP dialer, and don't connect/bind, then we have no FD (=0). If we set FD to INVALID_SOCKET on start, other parts of the code will fail since they consider that "closed", but we're not closed yet. Then check for family == AF_UNSPEC && fd == 0, if so don't close it. --- diff --git a/src/lib/ecore_con/efl_net_socket_fd.c b/src/lib/ecore_con/efl_net_socket_fd.c index 4bed00d..ec0134f 100644 --- a/src/lib/ecore_con/efl_net_socket_fd.c +++ b/src/lib/ecore_con/efl_net_socket_fd.c @@ -164,7 +164,8 @@ _efl_net_socket_fd_efl_io_closer_close(Eo *o, Efl_Net_Socket_Fd_Data *pd EINA_UN efl_loop_fd_set(efl_super(o, MY_CLASS), SOCKET_TO_LOOP_FD(INVALID_SOCKET)); efl_io_closer_fd_set(o, SOCKET_TO_LOOP_FD(INVALID_SOCKET)); - if (closesocket(fd) != 0) ret = efl_net_socket_error_get(); + if (!((pd->family == AF_UNSPEC) && (fd == 0))) /* if nothing is set, fds are all zero, avoid closing STDOUT */ + if (closesocket(fd) != 0) ret = efl_net_socket_error_get(); efl_event_callback_call(o, EFL_IO_CLOSER_EVENT_CLOSED, NULL); /* do the cleanup our _efl_net_socket_fd_efl_loop_fd_fd_set() would do */