summaryrefslogtreecommitdiff
path: root/libguile/gc-malloc.c
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2008-02-06 22:22:14 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2008-02-06 22:22:14 +0000
commit4a19ed04528750e7764837494dea39556aca09f8 (patch)
tree14cc88191da44f31d2ff099d4567ea72363d1f49 /libguile/gc-malloc.c
parent189171c5bb05de698d7704d86c57208773a0de4a (diff)
downloadguile-4a19ed04528750e7764837494dea39556aca09f8.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 4c71be6b7..165ddf46e 100644
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -319,7 +319,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;
}
@@ -365,7 +365,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 *