1 files changed, 24 insertions, 5 deletions

diff --git a/src/alloc.c b/src/alloc.c
index ae156d89f24..1d50f19e921 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2866,6 +2866,10 @@ int marker_block_index;
 
 union Lisp_Misc *marker_free_list;
 
+/* Marker blocks which should be freed at end of GC.  */
+
+struct marker_block *marker_blocks_pending_free;
+
 /* Total number of marker blocks now in use.  */
 
 int n_marker_blocks;
@@ -2876,6 +2880,7 @@ init_marker ()
   marker_block = NULL;
   marker_block_index = MARKER_BLOCK_SIZE;
   marker_free_list = 0;
+  marker_blocks_pending_free = 0;
   n_marker_blocks = 0;
 }
 
@@ -4531,6 +4536,18 @@ returns nil, because real GC can't be done.  */)
       }
   }
 
+  /* Undo lists have been cleaned up, so we can free marker blocks now.  */
+
+  {
+    struct marker_block *mblk;
+
+    while ((mblk = marker_blocks_pending_free) != 0)
+      {
+        marker_blocks_pending_free = mblk->next;
+        lisp_free (mblk);
+      }
+  }
+
   /* Clear the mark bits that we set in certain root slots.  */
 
   unmark_byte_stack ();
@@ -5439,6 +5456,7 @@ gc_sweep ()
     register int num_free = 0, num_used = 0;
 
     marker_free_list = 0;
+    marker_blocks_pending_free = 0;
 
     for (mblk = marker_block; mblk; mblk = *mprev)
       {
@@ -5469,19 +5487,20 @@ gc_sweep ()
         /* If this block contains only free markers and we have already
            seen more than two blocks worth of free markers then deallocate
            this block.  */
-#if 0
-        /* There may still be pointers to these markers from a buffer's
-           undo list, so don't free them.  KFS 2004-05-21  /
         if (this_free == MARKER_BLOCK_SIZE && num_free > MARKER_BLOCK_SIZE)
           {
             *mprev = mblk->next;
             /* Unhook from the free list.  */
             marker_free_list = mblk->markers[0].u_free.chain;
-            lisp_free (mblk);
             n_marker_blocks--;
+
+            /* It is not safe to free the marker block at this stage,
+               since there may still be pointers to these markers from
+               a buffer's undo list.  KFS 2004-05-25.  */
+            mblk->next = marker_blocks_pending_free;
+            marker_blocks_pending_free = mblk;
           }
         else
-#endif
           {
             num_free += this_free;
             mprev = &mblk->next;