mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00
Code Activity

(scm_gc_register_collectable_memory): avoid

Browse source 
wrap-around for scm_mtrigger
(scm_gc_register_collectable_memory): abort on overflowing
scm_mallocated().
This commit is contained in:
Han-Wen Nienhuys 2003-05-14 11:01:23 +00:00
parent 59e4263131
commit 131805f0cd
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libguile/gc-malloc.c
View file

@ -180,6 +180,11 @@ scm_strdup (const char *str)
void
scm_gc_register_collectable_memory (void *mem, size_t size, const char *what)
{
if (ULONG_MAX - size < scm_mallocated)
{
scm_memory_error ("Overflow of scm_mallocated: too much memory in use.");
}
scm_mallocated += size;
/*
@ -230,7 +235,12 @@ scm_gc_register_collectable_memory (void *mem, size_t size, const char *what)
float no_overflow_trigger = scm_mallocated * 110.0;
no_overflow_trigger /= (float) (100.0 - scm_i_minyield_malloc);
scm_mtrigger = (unsigned long) no_overflow_trigger;
if (no_overflow_trigger >= (float) ULONG_MAX)
scm_mtrigger = ULONG_MAX;
else
scm_mtrigger = (unsigned long) no_overflow_trigger;
#ifdef DEBUGINFO
fprintf (stderr, "Mtrigger sweep: ineffective. New trigger %d\n",
@ -268,7 +278,6 @@ scm_gc_malloc (size_t size, const char *what)
again in scm_gc_register_collectable_memory. We don't really
want the second GC since it will not find new garbage.
Note: this is a theoretical peeve. In reality, malloc() never
returns NULL. Usually, memory is overcommitted, and when you try
to write it the program is killed with signal 11. --hwn