From 687915299ae8229eba7312d102851e08c7792e7e Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Mon, 1 Apr 2019 20:08:27 +0200 Subject: [PATCH] Don't try to set socket options on invalid socket. --- common/TracySocket.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/common/TracySocket.cpp b/common/TracySocket.cpp index 321d3292..b952d0cd 100644 --- a/common/TracySocket.cpp +++ b/common/TracySocket.cpp @@ -315,20 +315,16 @@ Socket* ListenSocket::Accept() if( poll( &fd, 1, 10 ) > 0 ) { int sock = accept( m_sock, (sockaddr*)&remote, &sz); + if( sock == -1 ) return nullptr; + #if defined __APPLE__ int val = 1; setsockopt( sock, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof( val ) ); #endif - if( sock == -1 ) - { - return nullptr; - } - else - { - auto ptr = (Socket*)tracy_malloc( sizeof( Socket ) ); - new(ptr) Socket( sock ); - return ptr; - } + + auto ptr = (Socket*)tracy_malloc( sizeof( Socket ) ); + new(ptr) Socket( sock ); + return ptr; } else {