X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=e7dbdfd153a46f7e757045b5e9ecaa252a1c7f5d;hb=8bb8f286dbacf1792a26de693c795d268516672c;hp=ae429b41543a0e65c55a49e7ad931cf614ee6032;hpb=d8a6359622d77e002c11e13362d4e174b3fe4004;p=sbcl.git

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index ae429b4..e7dbdfd 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -107,7 +107,7 @@ lose:
 }
 
 static void
-process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset)
+process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset)
 {
     struct ndir_entry *entry;
 
@@ -349,7 +349,16 @@ load_core_file(char *file, os_vm_offset_t file_offset)
                 size -= bytes_read;
                 while (bytes_read) {
                     bytes_read -= sizeof(long);
-                    page_table[offset++].first_object_offset = data[i++];
+                    /* Ignore all zeroes. The size of the page table
+                     * core entry was rounded up to os_vm_page_size
+                     * during the save, and might now have more
+                     * elements than the page table.
+                     */
+                    if (data[i]) {
+                        page_table[offset].first_object_offset = data[i];
+                    }
+                    i++;
+                    offset++;
                 }
             }