summaryrefslogtreecommitdiff
path: root/libguile/gc-malloc.c
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2008-02-06 22:16:35 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2008-02-06 22:16:35 +0000
commitc14bb7ad225e6db1ca109edf9ed87f32d595b1db (patch)
tree80c82aea41d4aa17286140f0a76d0a368aec8155 /libguile/gc-malloc.c
parent136cddb3e41d450b069bf0bcfe9cd9a48b95bfa6 (diff)
downloadguile-c14bb7ad225e6db1ca109edf9ed87f32d595b1db.tar.gz
(scm_gc_malloc): Return NULL if requested size is 0.
(scm_gc_free): Don't call `free' if mem is NULL.
Diffstat (limited to 'libguile/gc-malloc.c')
-rw-r--r--libguile/gc-malloc.c5
1 files changed, 3 insertions, 2 deletions
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 *