1.0.27.3: fix UNWIND-TO-FRAME-AND-CALL

diff --git a/NEWS b/NEWS
index cdc89ef..fed0849 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 changes in sbcl-1.0.28 relative to 1.0.27:
   * bug fix: timers could go off in the wrong order, be delayed indefinitely
     (thanks to Ole Arndt for the patch)
+  * bug fix: RESTART-FRAME and RETURN-FROM-FRAME stack corruption
 
 changes in sbcl-1.0.27 relative to 1.0.26:
   * new port: support added for x86-64 OpenBSD. (thanks to Josh Elsasser)

diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp
index 5425b3b..6208d5c 100644 (file)
--- a/src/compiler/x86-64/nlx.lisp
+++ b/src/compiler/x86-64/nlx.lisp
@@ -245,7 +245,7 @@
                            temp)
 
     ;; Allocate space for magic UWP block.
-    (inst sub rsp-tn unwind-block-size)
+    (inst sub rsp-tn (* unwind-block-size n-word-bytes))
     ;; Set up magic catch / UWP block.
     (move block rsp-tn)
     (loadw temp uwp sap-pointer-slot other-pointer-lowtag)

diff --git a/src/compiler/x86/nlx.lisp b/src/compiler/x86/nlx.lisp
index 72b1366..37b752a 100644 (file)
--- a/src/compiler/x86/nlx.lisp
+++ b/src/compiler/x86/nlx.lisp
@@ -266,7 +266,7 @@
                            temp)
 
     ;; Allocate space for magic UWP block.
-    (inst sub esp-tn unwind-block-size)
+    (inst sub esp-tn (* unwind-block-size n-word-bytes))
     ;; Set up magic catch / UWP block.
     (move block esp-tn)
     (loadw temp uwp sap-pointer-slot other-pointer-lowtag)

diff --git a/version.lisp-expr b/version.lisp-expr
index 7bf1e02..3809e5a 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.27.2"
+"1.0.27.3"