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

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index bfcef14df600ccb9d143582b52bfa41f173f213a..f509528ba195430d4a74d49fd6dbdcbc1bdc81ac 100644 (file)
--- 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 8fce69f9ef4da7ab53efad9a072a7a805fb4d6bf..dec9b63628a6685536df498b2f87314d242e9191 100644 (file)
--- 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)))))