Proposed fix for [f32864af]

tcltk · Dec 15, 2024 · 6ae6651 · 6ae6651
1 parent de4730f
commit 6ae6651
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/generic/threadSpCmd.c b/generic/threadSpCmd.c
@@ -706,7 +706,7 @@ ThreadEvalObjCmd(
     }
 
     /*
-     * Find out wether to use the internal (recursive) mutex
+     * Find out whether to use the internal (recursive) mutex
      * or external mutex given on the command line, and lock
      * the corresponding mutex immediately.
      *
@@ -733,11 +733,13 @@ ThreadEvalObjCmd(
 	    return TCL_ERROR;
 	}
 	if (IsReadWrite(mutexPtr)) {
+            PutMutex(mutexPtr);
 	    Tcl_AppendResult(interp, "wrong mutex type, must be exclusive "
 			     "or recursive", (void *)NULL);
 	    return TCL_ERROR;
 	}
 	if (!SpMutexLock(mutexPtr)) {
+            PutMutex(mutexPtr);
 	    Tcl_AppendResult(interp, "locking the same exclusive mutex "
 			     "twice from the same thread", (void *)NULL);
 	    return TCL_ERROR;
@@ -777,6 +779,7 @@ ThreadEvalObjCmd(
 	Sp_RecursiveMutexUnlock(&evalMutex);
     } else {
 	SpMutexUnlock(mutexPtr);
+        PutMutex(mutexPtr);
     }
 
     return ret;

diff --git a/tests/thread.test b/tests/thread.test
@@ -1267,7 +1267,7 @@ test thread-bug-f32864afe3 {Hang in thread::eval -lock} -body {
     set mu [thread::mutex create]
     thread::eval -lock $mu {}
     thread::mutex destroy $mu ; # <- Bug f32864af hang
-} -result {} -constraints bug-f32864afe3
+} -result {}
 
 removeFile dummyForTransfer
 ::tcltest::cleanupTests