From dd7b6e22451427342c566bd331192a76a3d32d32 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 4 Mar 2020 20:50:38 +0000 Subject: The close routines of the "tcp" channel type were failing to record error messages and error codes. --- unix/tclUnixSock.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index a00559a..0dd8e86 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -631,6 +631,9 @@ TcpCloseProc( freeaddrinfo(statePtr->myaddrlist); } ckfree(statePtr); + if (interp && errorCode) { + Tcl_SetResult(interp, (char *)Tcl_PosixError(interp), TCL_STATIC); + } return errorCode; } @@ -660,6 +663,7 @@ TcpClose2Proc( TcpState *statePtr = instanceData; int readError = 0; int writeError = 0; + int errorCode = 0; /* * Shutdown the OS socket handle. @@ -673,7 +677,12 @@ TcpClose2Proc( if ((flags & TCL_CLOSE_WRITE) && (shutdown(statePtr->fds.fd, SHUT_WR) < 0)) { writeError = errno; } - return (readError != 0) ? readError : writeError; + + errorCode = (readError != 0) ? readError : writeError; + if (interp && errorCode) { + Tcl_SetResult(interp, (char *)Tcl_PosixError(interp), TCL_STATIC); + } + return errorCode; } /* -- cgit v0.12