[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 7460840 02/10: Fix CHECK_ALLOCATED_AND_LIVE abort
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 7460840 02/10: Fix CHECK_ALLOCATED_AND_LIVE abort during GC |
Date: |
Sun, 3 Jun 2018 12:57:52 -0400 (EDT) |
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
- [Emacs-diffs] emacs-26 updated (5fa73a7 -> 9a14b4d), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 71192e0 01/10: Don't wait for visible frames to become visible, Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 7460840 02/10: Fix CHECK_ALLOCATED_AND_LIVE abort during GC,
Noam Postavsky <=
- [Emacs-diffs] emacs-26 0ac98cc 07/10: * lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363)., Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 51ee8bc 04/10: Centralize Bug#30931 fix, Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 3ba5fc2 08/10: esh-opt.el: Fix improper parsing of first argument (Bug#28323), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 9552485 06/10: Fix cl-print for circular sublists (Bug#31146), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 daa6023 03/10: Fix another case of freed markers in the undo-list (Bug#30931), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 ed962f2 09/10: Fix bug#30846, along with misc cleanups found along the way, Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 4c6cdf6 05/10: Revert "Make mail-extract-address-components return the user name more", Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 9a14b4d 10/10: ; Merge: backports from master, Noam Postavsky, 2018/06/03