Fix checks for socket values, 0 is a legal value.

To make this work, we also have to initialize sockets
to a default value of -1.

Also close a client listen socket if it's open.

Signed-off-by: Christian Beier <dontmind@freeshell.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

1 files changed, 5 insertions, 2 deletions

diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c
index b5fb420..0361827 100644
--- a/libvncclient/vncviewer.c
+++ b/libvncclient/vncviewer.c
@@ -190,7 +190,8 @@ rfbClient* rfbGetClient(int bitsPerSample,int samplesPerPixel,
 #ifdef LIBVNCSERVER_WITH_CLIENT_TLS
   client->tlsSession = NULL;
 #endif
-
+  client->sock = -1;
+  client->listenSock = -1;
   return client;
 }
 
@@ -334,8 +335,10 @@ void rfbClientCleanup(rfbClient* client) {
 #endif
 
   FreeTLS(client);
-  if (client->sock > 0)
+  if (client->sock >= 0)
     close(client->sock);
+  if (client->listenSock >= 0)
+    close(client->listenSock);
   free(client->desktopName);
   free(client->serverHost);
   free(client);