[Emacs-diffs] emacs-26 7460840 02/10: Fix CHECK_ALLOCATED_AND_LIVE abort during GC

[Noam Postavsky]

branch: emacs-26
commit 7460840a6c9ab713e8ccc470011495fdb86a61d7
Author: Paul Eggert <address@hidden>
Commit: Noam Postavsky <address@hidden>

    Fix CHECK_ALLOCATED_AND_LIVE abort during GC
    
    * src/editfns.c (save_restriction_restore):
    Wait for the GC to free the temporary markers (Bug#30931).
    
    (cherry picked from commit 670f2ffae718046c0fb37313965a51c040ed096f)
---
 src/editfns.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/editfns.c b/src/editfns.c
index d0ccdbd..3fc08f9 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3876,9 +3876,10 @@ save_restriction_restore (Lisp_Object data)
 
          buf->clip_changed = 1; /* Remember that the narrowing changed. */
        }
-      /* These aren't needed anymore, so don't wait for GC.  */
-      free_marker (XCAR (data));
-      free_marker (XCDR (data));
+      /* This isn’t needed anymore, so don’t wait for GC.
+         Do not call free_marker on XCAR (data) or XCDR (data),
+         though, since record_marker_adjustments may have put
+         them on the buffer’s undo list (Bug#30931).  */
       free_cons (XCONS (data));
     }
   else