diff options
author | Neil Jerram <neil@ossau.uklinux.net> | 2008-02-06 22:16:35 +0000 |
---|---|---|
committer | Neil Jerram <neil@ossau.uklinux.net> | 2008-02-06 22:16:35 +0000 |
commit | c14bb7ad225e6db1ca109edf9ed87f32d595b1db (patch) | |
tree | 80c82aea41d4aa17286140f0a76d0a368aec8155 | |
parent | 136cddb3e41d450b069bf0bcfe9cd9a48b95bfa6 (diff) | |
download | guile-c14bb7ad225e6db1ca109edf9ed87f32d595b1db.tar.gz |
(scm_gc_malloc): Return NULL if requested size is 0.
(scm_gc_free): Don't call `free' if mem is NULL.
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | THANKS | 1 | ||||
-rw-r--r-- | libguile/ChangeLog | 5 | ||||
-rw-r--r-- | libguile/gc-malloc.c | 5 |
4 files changed, 11 insertions, 2 deletions
@@ -21,6 +21,8 @@ called with an associator proc that returns neither a pair nor #f. ** Avoid MacOS build problems caused by incorrect combination of "64" system and library calls. ** Fixed compilation of `numbers.c' with Sun Studio (Solaris 9) +** Fixed wrong-type-arg errors when creating zero length SRFI-4 +uniform vectors on AIX. * New modules (see the manual for details) @@ -77,6 +77,7 @@ For fixes or providing information which led to a fix: Alex Shinn Daniel Skarda Cesar Strauss + Rainer Tammer Richard Todd Issac Trotts Greg Troxel diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 84dd8950b..18e473b79 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,8 @@ +2008-02-06 Neil Jerram <neil@ossau.uklinux.net> + + * gc-malloc.c (scm_gc_malloc): Return NULL if requested size is 0. + (scm_gc_free): Don't call `free' if mem is NULL. + 2008-02-06 Ludovic Courtès <ludo@gnu.org> * numbers.c (scm_i_mkbig, scm_i_long2big, scm_i_ulong2big, diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c index 638944a04..6ff8d0c3f 100644 --- a/libguile/gc-malloc.c +++ b/libguile/gc-malloc.c @@ -317,7 +317,7 @@ scm_gc_malloc (size_t size, const char *what) to write it the program is killed with signal 11. --hwn */ - void *ptr = scm_malloc (size); + void *ptr = size ? scm_malloc (size) : NULL; scm_gc_register_collectable_memory (ptr, size, what); return ptr; } @@ -363,7 +363,8 @@ void scm_gc_free (void *mem, size_t size, const char *what) { scm_gc_unregister_collectable_memory (mem, size, what); - free (mem); + if (mem) + free (mem); } char * |