Repair linked list management in Tcl_DeleteCloseHandler().

CloseCallback struct is used only locally.  Remove from tclIO.h.

1 files changed, 14 insertions, 0 deletions

diff --git a/generic/tclIO.c b/generic/tclIO.c
index eace472..ed08112 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -70,6 +70,18 @@ typedef struct ThreadSpecificData {
 static Tcl_ThreadDataKey dataKey;
 
 /*
+ * Structure to record a close callback. One such record exists for
+ * each close callback registered for a channel.
+ */
+
+typedef struct CloseCallback {
+    Tcl_CloseProc *proc;		/* The procedure to call. */
+    ClientData clientData;		/* Arbitrary one-word data to pass
+					 * to the callback. */
+    struct CloseCallback *nextPtr;	/* For chaining close callbacks. */
+} CloseCallback;
+
+/*
  * Static functions in this file:
  */
 
@@ -504,6 +516,8 @@ Tcl_DeleteCloseHandler(chan, proc, clientData)
         if ((cbPtr->proc == proc) && (cbPtr->clientData == clientData)) {
             if (cbPrevPtr == (CloseCallback *) NULL) {
                 statePtr->closeCbPtr = cbPtr->nextPtr;
+	    } else {
+		cbPrevPtr->nextPtr = cbPtr->nextPtr;
             }
             ckfree((char *) cbPtr);
             break;