From: Taylor R Campbell <campbell@mumble.net>
Date: Tue, 11 Dec 2018 15:48:03 +0000 (+0000)
Subject: Move fasl version check earlier.
X-Git-Tag: mit-scheme-pucked-10.1.9~3^2~35^2~42
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=bced7a201459654db4193c5539fac9b54e323d08;p=mit-scheme.git

Move fasl version check earlier.

This breaks INHIBIT_FASL_VERSION_CHECK -- but that was already broken
so that Scheme would abort (!) before even getting to the check,
because of the conditional in fasl_object_address which is called by
decode_fasl_header.

If someone wants to revive INHIBIT_FASL_VERSION_CHECK, be my guest,
though it might be easier to do whatever you're trying to do with the
portable fasdumper instead.
---

diff --git a/src/microcode/fasl.c b/src/microcode/fasl.c
index c2c777fe0..672ab9cbf 100644
--- a/src/microcode/fasl.c
+++ b/src/microcode/fasl.c
@@ -209,6 +209,8 @@ decode_fasl_header (SCHEME_OBJECT * raw, fasl_header_t * h)
     (FASLHDR_VERSION (h)) = (FASL_VERSION (object));
     (FASLHDR_ARCH (h)) = (FASL_ARCH (object));
   }
+  if ((check_fasl_version (h)) != FASL_FILE_FINE)
+    return (false);
   {
     SCHEME_OBJECT object = (raw[FASL_OFFSET_CI_VERSION]);
     (FASLHDR_CC_VERSION (h)) = (CI_VERSION (object));