[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110430: Don't abort when ralloc.c:re
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110430: Don't abort when ralloc.c:relinquish cannot return a heap to the system. |
Date: |
Sun, 07 Oct 2012 20:33:10 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110430
fixes bug: http://debbugs.gnu.org/12402
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-07 20:33:10 +0200
message:
Don't abort when ralloc.c:relinquish cannot return a heap to the system.
src/ralloc.c (relinquish): If a heap is ready to be relinquished,
but it still has blocs in it, don't return it to the system,
instead of aborting. (Bug#12402)
modified:
src/ChangeLog
src/ralloc.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-07 16:54:43 +0000
+++ b/src/ChangeLog 2012-10-07 18:33:10 +0000
@@ -1,3 +1,9 @@
+2012-10-07 Eli Zaretskii <address@hidden>
+
+ * ralloc.c (relinquish): If a heap is ready to be relinquished,
+ but it still has blocs in it, don't return it to the system,
+ instead of aborting. (Bug#12402)
+
2012-10-07 Jan Djärv <address@hidden>
* nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506).
=== modified file 'src/ralloc.c'
--- a/src/ralloc.c 2012-10-01 11:37:37 +0000
+++ b/src/ralloc.c 2012-10-07 18:33:10 +0000
@@ -327,10 +327,11 @@
if ((char *)last_heap->end - (char *)last_heap->bloc_start <= excess)
{
- /* This heap should have no blocs in it. */
+ /* This heap should have no blocs in it. If it does, we
+ cannot return it to the system. */
if (last_heap->first_bloc != NIL_BLOC
|| last_heap->last_bloc != NIL_BLOC)
- emacs_abort ();
+ return;
/* Return the last heap, with its header, to the system. */
excess = (char *)last_heap->end - (char *)last_heap->start;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110430: Don't abort when ralloc.c:relinquish cannot return a heap to the system.,
Eli Zaretskii <=