Fix save-image-and-exit bug

diff --git a/core/memory/memory-tests.factor b/core/memory/memory-tests.factor
index 9fded3eb3a6bafc45a81a5008a0c3cf4a50b4c6c..1c23e700ca0c661a89615faff135c41335bb15ab 100755 (executable)
--- a/core/memory/memory-tests.factor
+++ b/core/memory/memory-tests.factor
@@ -1,4 +1,4 @@
-USING: generic kernel kernel.private math memory prettyprint
+USING: generic kernel kernel.private math memory prettyprint io
 sequences tools.test words namespaces layouts classes
 classes.builtin arrays quotations ;
 IN: memory.tests
@@ -19,6 +19,7 @@ TUPLE: testing x y z ;
 [ ] [
     num-types get [
         type>class [
+            dup . flush
             "predicate" word-prop instances [
                 class drop
             ] each

diff --git a/vm/image.c b/vm/image.c
index a668cb791397d8606634e193a5ad7cd8f5e8d8b7..62f9e1c906c2ea83f832e19f9b8e77ddfa6d2fd7 100755 (executable)
--- a/vm/image.c
+++ b/vm/image.c
@@ -186,13 +186,16 @@ void strip_compiled_quotations(void)
 
 DEFINE_PRIMITIVE(save_image_and_exit)
 {
-       /* This reduces deployed image size */
-       strip_compiled_quotations();
-
+       /* We unbox this before doing anything else. This is the only point
+       where we might throw an error, so we have to throw an error here since
+       later steps destroy the current image. */
        F_CHAR *path = unbox_native_string();
 
        REGISTER_C_STRING(path);
 
+       /* This reduces deployed image size */
+       strip_compiled_quotations();
+
        /* strip out userenv data which is set on startup anyway */
        CELL i;
        for(i = 0; i < FIRST_SAVE_ENV; i++)