commit 9b2a0f5c755b0dc4a93c6a77e3f6bdb59a3ba96c Merge: 5c9008e a8e76de Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 3 15:41:50 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug9400 | 7 +++++++ src/common/compat.c | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

diff --cc src/common/compat.c index 3768933,d88c5f9..d6ea418 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -1313,12 -1225,12 +1313,12 @@@ tor_ersatz_socketpair(int family, int t * for now, and really, when localhost is down sometimes, we * have other problems too. */ - tor_socket_t listener = -1; - tor_socket_t connector = -1; - tor_socket_t acceptor = -1; + tor_socket_t listener = TOR_INVALID_SOCKET; + tor_socket_t connector = TOR_INVALID_SOCKET; + tor_socket_t acceptor = TOR_INVALID_SOCKET; struct sockaddr_in listen_addr; struct sockaddr_in connect_addr; - int size; + socklen_t size; int saved_errno = -1;

if (protocol @@@ -1394,15 -1306,15 +1394,15 @@@ tidy_up_and_fail: if (saved_errno < 0) saved_errno = errno; - if (listener != -1) + if (SOCKET_OK(listener)) tor_close_socket(listener); - if (connector != -1) + if (SOCKET_OK(connector)) tor_close_socket(connector); - if (acceptor != -1) + if (SOCKET_OK(acceptor)) tor_close_socket(acceptor); return -saved_errno; -#endif } +#endif

/** Number of extra file descriptors to keep in reserve beyond those that we * tell Tor it's allowed to use. */