diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2002-05-15 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> + + * 17166: Src/Modules/zftp.c: must check fileno of zftp control + connection before it's closed. + 2002-05-15 Sven Wischnowsky <wischnow@zsh.org> * 17163: Src/Zle/compcore.c: follow-up to 17135, diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 80e09045c..de762e883 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -2678,14 +2678,15 @@ zfclose(int leaveparams) zfsendcmd("QUIT\r\n"); } 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. + * TCP fd. We need to do this before closing the FILE, since + * it's not usable afterwards. */ if (fileno(zfsess->cin) == zfsess->control->fd) zfsess->control->fd = -1; + fclose(zfsess->cin); zfsess->cin = NULL; } if (zfsess->control) { |