Fix [f32864af] - thread::eval hang

tcltk · Dec 16, 2024 · bcfa337 · bcfa337
1 parent 6fb0e05
commit bcfa337
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/generic/threadSpCmd.c b/generic/threadSpCmd.c
@@ -713,7 +713,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.
      *
@@ -740,11 +740,13 @@ ThreadEvalObjCmd(
 	    return TCL_ERROR;
 	}
 	if (IsReadWrite(mutexPtr)) {
+            PutMutex(mutexPtr);
 	    Tcl_AppendResult(interp, "wrong mutex type, must be exclusive "
 			     "or recursive", NULL);
 	    return TCL_ERROR;
 	}
 	if (!SpMutexLock(mutexPtr)) {
+            PutMutex(mutexPtr);
 	    Tcl_AppendResult(interp, "locking the same exclusive mutex "
 			     "twice from the same thread", NULL);
 	    return TCL_ERROR;
@@ -786,6 +788,7 @@ ThreadEvalObjCmd(
 	Sp_RecursiveMutexUnlock(&evalMutex);
     } else {
 	SpMutexUnlock(mutexPtr);
+        PutMutex(mutexPtr);
     }
 
     return ret;

diff --git a/tests/thread.test b/tests/thread.test
@@ -1250,5 +1250,11 @@ test thread-21.16 {thread::cond - delete waited variable} {
     list $c1 $c2 $r1 $r2
 } {1 0 {condition variable is in use} {}}
 
+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 {}
+
 removeFile dummyForTransfer
 ::tcltest::cleanupTests