From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 29 Sep 2022 13:08:37 +0000 (-0400)
Subject: alloc.c: Avoid nested overlay iterations (bug#58158)
X-Git-Tag: emacs-29.0.90~1616^2~406^2~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b954f8f9d9b4b015e5aa57a2307f92801669932;p=emacs.git

alloc.c: Avoid nested overlay iterations (bug#58158)

* src/alloc.c (mark_overlays): New function.
(mark_buffer): Use it instead of using the overlay iterator.
---

diff --git a/src/alloc.c b/src/alloc.c
index be55dcf8dfd..8dc45659b50 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6512,6 +6512,21 @@ mark_overlay (struct Lisp_Overlay *ov)
   mark_object (ov->plist);
 }
 
+static void
+mark_overlays (struct interval_tree *it, struct interval_node *in)
+{
+  /* `left/right` are set to NULL when the overlay is deleted, but
+     they use the `null` node instead when the overlay is not deleted
+     (i.e. is within an overlay tree).  */
+  eassert (in);
+  if (in == &it->null)
+    return;
+
+  mark_object (in->data);
+  mark_overlays (it, in->left);
+  mark_overlays (it, in->right);
+}
+
 /* Mark Lisp_Objects and special pointers in BUFFER.  */
 
 static void
@@ -6533,11 +6548,8 @@ mark_buffer (struct buffer *buffer)
   if (!BUFFER_LIVE_P (buffer))
       mark_object (BVAR (buffer, undo_list));
 
-  struct interval_node *node;
-  buffer_overlay_iter_start (buffer, PTRDIFF_MIN, PTRDIFF_MAX, ITREE_ASCENDING);
-  while ((node = buffer_overlay_iter_next (buffer)))
-    mark_overlay (XOVERLAY (node->data));
-  buffer_overlay_iter_finish (buffer);
+  if (buffer->overlays)
+    mark_overlays (buffer->overlays, buffer->overlays->root);
 
   /* If this is an indirect buffer, mark its base buffer.  */
   if (buffer->base_buffer &&