Changeset 39082 in project

Timestamp:

10/29/20 18:55:52 (4 months ago)

Author:

wasamasa

Message:

Correct dynamic-wind usage (see #1127)

File:

• release/5/openssl/trunk/openssl.scm (modified) (6 diffs)

release/5/openssl/trunk/openssl.scm

@@ -98 +98 @@
 
 ;;; support routines
+
+(define (dynamic-wind+ before thunk after)
+  (handle-exceptions exn
+    (signal exn)
+    (dynamic-wind
+        before
+        thunk
+        after)))
 
 (define-foreign-variable strerror c-string "strerror(errno)")
@@ -428 +436 @@
         (mutex (make-mutex 'ssl-mutex)))
     (define (startup #!optional (called-from-close #f))
-      (dynamic-wind
+      (dynamic-wind+
           (lambda ()
             (mutex-lock! mutex))
@@ -438 +446 @@
                (unless (or in-open? out-open?)
                  (let ((success? #f))
-                   (dynamic-wind
+                   (dynamic-wind+
                      void
                      (lambda ()
@@ -460 +468 @@
       (unless (or in-open? out-open?)
         (set! ctx #f) ;; ensure that this reference is lost
-        (dynamic-wind
+        (dynamic-wind+
             void
             (lambda ()
@@ -548 +556 @@
          (lambda ()
            (when (startup #t)
-             (dynamic-wind
+             (dynamic-wind+
                void
                (lambda ()
@@ -615 +623 @@
          (ssl (ssl-new ctx))
          (success? #f))
-    (dynamic-wind
+    (dynamic-wind+
       void
       (lambda ()