From: Juho S. <js...@us...> - 2005-12-30 00:21:50
|
Update of /cvsroot/sbcl/sbcl/src/code In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7324/src/code Modified Files: load.lisp early-fasl.lisp Log Message: 0.9.8.6: Make the count of fasl header counted strings a 32-bit value also on 64-bit platforms. This ensures that a x86-64 SBCL can gracefully detect an error when trying to read a x86 fasl instead of choking on a ridiculously long counted string. Index: load.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/load.lisp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- load.lisp 14 Jul 2005 16:30:36 -0000 1.38 +++ load.lisp 30 Dec 2005 00:21:42 -0000 1.39 @@ -114,6 +114,10 @@ (declare (optimize (speed 0))) (read-arg #.sb!vm:n-word-bytes)) +(defun read-unsigned-byte-32-arg () + (declare (optimize (speed 0))) + (read-arg 4)) + ;;;; the fop table @@ -305,7 +309,7 @@ ;; Read and validate version-specific compatibility stuff. (flet ((string-from-stream () - (let* ((length (read-word-arg)) + (let* ((length (read-unsigned-byte-32-arg)) (result (make-string length))) (read-string-as-bytes stream result) result))) Index: early-fasl.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/early-fasl.lisp,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- early-fasl.lisp 6 Nov 2005 08:40:31 -0000 1.60 +++ early-fasl.lisp 30 Dec 2005 00:21:42 -0000 1.61 @@ -76,7 +76,7 @@ ;;; versions which break binary compatibility. But it certainly should ;;; be incremented for release versions which break binary ;;; compatibility. -(def!constant +fasl-file-version+ 61) +(def!constant +fasl-file-version+ 62) ;;; (record of versions before 2003 deleted in 2003-04-26/0.pre8.107 or so) ;;; 38: (2003-01-05) changed names of internal SORT machinery ;;; 39: (2003-02-20) in 0.7.12.1 a slot was added to @@ -128,6 +128,8 @@ ;;; 60: (2005-10-24) Bumped for 0.9.6 ;;; 61: (2005-11-06) Improved source location recording added extra parameters ;;; to multiple %DEFMUMBLE functions. +;;; 62: (2005-12-30) Make the count of FASL header counted strings +;;; a 32-bit value also on 64-bit platforms. ;;; the conventional file extension for our fasl files (declaim (type simple-string *fasl-file-type*)) |