From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sun, 11 Mar 2018 17:07:13 +0000 (-0700)
Subject: runtime: Unlock mutexes more carefully.  md5-string NOT deprecated.
X-Git-Tag: mit-scheme-pucked-x11-0.2.2~58
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0ce8ffe36b5c45068e02118aced4d0f32046ceff;p=mit-scheme.git

runtime: Unlock mutexes more carefully.  md5-string NOT deprecated.
---

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index bfcef14df..f509528ba 100644
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -5063,7 +5063,8 @@ USA.
 	  mcrypt-open-module
 	  mcrypt-self-test
 	  mcrypt-supported-key-sizes
-	  md5-available?
+	  md5-available?)
+  (export ()
 	  md5-bytevector
 	  md5-file
 	  md5-string)
diff --git a/src/runtime/thread.scm b/src/runtime/thread.scm
index 8fce69f9e..dec9b6362 100644
--- a/src/runtime/thread.scm
+++ b/src/runtime/thread.scm
@@ -1216,7 +1216,9 @@ USA.
   (without-interrupts
    (lambda ()
      (let ((owner (thread-mutex/owner mutex)))
-       (if (and owner (not (eq? owner (current-thread))))
+       (if (not owner)
+	   (error "Unowned mutex:" mutex))
+       (if (not (eq? owner (current-thread)))
 	   (error "Don't own mutex:" mutex))
        (%unlock-thread-mutex mutex owner)))))