Avoid double free of client.conn if HandleClientRequest detects disconnect

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/server.c b/src/server.c
index cc853bf..51bdf91 100644
--- a/src/server.c
+++ b/src/server.c
@@ -494,6 +494,7 @@ HandleClientRequest(client_state *client, xhiv_response *responses)
         if ((rbytes == 0) && (errno == 0)) {
             /* client disconnected */
             _XSERVTransClose(client->conn);
+            client->conn = NULL;
             return;
         }
         if (rbytes <= 0) {
@@ -728,7 +729,8 @@ XhivRunServer(XtransConnInfo *ListenTransConns, int ListenTransCount,
         else
             clientfd.events = POLLIN | POLLOUT;
     }
-    _XSERVTransClose(client.conn);
+    if (client.conn != NULL)
+        _XSERVTransClose(client.conn);
     exit(0);
 }