[packages/guile1: 103/172] - proper(?) fix from guile CVS
jajcus
jajcus at pld-linux.org
Sat Dec 12 13:47:26 CET 2015
commit 2fb505597fef084ad58f617274215149534fa4c0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon May 31 22:09:23 2004 +0000
- proper(?) fix from guile CVS
Changed files:
guile-realloc.patch -> 1.2
guile-realloc.patch | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/guile-realloc.patch b/guile-realloc.patch
index eea6989..e034e57 100644
--- a/guile-realloc.patch
+++ b/guile-realloc.patch
@@ -1,12 +1,18 @@
---- guile-1.6.4/libguile/gc.c.orig 2004-05-24 21:54:13.755811688 +0200
-+++ guile-1.6.4/libguile/gc.c 2004-05-24 21:53:44.038032247 +0200
-@@ -1129,6 +1129,9 @@
- /* FIXME: we should have a means to register C functions to be run
- * in different phases of GC
- */
-+ /* don't try to use scm_subr_table during its reallocation
-+ * (when scm_subr_table still points to old memory area after realloc() call) */
-+ if (strcmp(what, "scm_subr_table") != 0)
- scm_mark_subr_table ();
+--- guile-1.6.4/libguile/gc.c.orig 2003-04-20 20:16:59.000000000 +0200
++++ guile-1.6.4/libguile/gc.c 2004-05-31 23:21:10.807334759 +0200
+@@ -2048,9 +2048,14 @@
+ scm_must_free() won't take NULL.
+ */
+ scm_mallocated += size - old_size;
+- SCM_SYSCALL (ptr = realloc (where, size));
- #ifndef USE_THREADS
++ /*
++ The realloc must be after check_mtrigger(), since realloc might
++ munge the old block of memory, which will be scanned by GC.
++ */
+ check_mtrigger (what);
++
++ SCM_SYSCALL (ptr = realloc (where, size));
+
+ if (NULL != ptr)
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/guile1.git/commitdiff/ebe6c26bec9cbe3813afc2be58f989889f8e944a
More information about the pld-cvs-commit
mailing list