16176: Src/Modules/tcp.c, Src/Modules/zftp.c: after fdclose(),

TCP control fd is no longer valid, but we still need to remove
the session cleanly.

2 files changed, 15 insertions, 6 deletions

diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c
index 1fe813e3f..9109ca7c1 100644
--- a/Src/Modules/tcp.c
+++ b/Src/Modules/tcp.c
@@ -291,19 +291,21 @@ tcp_close(Tcp_session sess)
 {
     int err;
     
-    if (sess && sess->fd != -1)
+    if (sess)
     {  
-	err = close(sess->fd);
-	if (err)
+	if (sess->fd != -1)
 	{
-	    zwarn("connection close failed: %e", NULL, errno);
-	    return -1;
+	    err = close(sess->fd);
+	    if (err)
+	    {
+		zwarn("connection close failed: %e", NULL, errno);
+		return -1;
+	    }
 	}
 	zts_delete(sess);
 	return 0;
     }
 
-    zts_delete(sess);
     return -1;
 }
 
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index 8dda5f1a8..9408c7a1f 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -2679,6 +2679,13 @@ zfclose(int leaveparams)
     }
     if (zfsess->cin) {
 	fclose(zfsess->cin);
+	/*
+	 * We fdopen'd the TCP control fd; since we can't fdclose it,
+	 * we need to perform a full fclose, which invalidates the
+	 * TCP fd.
+	 */
+	if (fileno(zfsess->cin) == zfsess->control->fd)
+	    zfsess->control->fd = -1;
 	zfsess->cin = NULL;
     }
     if (zfsess->control) {