summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
Diffstat (limited to 'libguile')
-rw-r--r--libguile/ChangeLog5
-rw-r--r--libguile/gc-malloc.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 7bcb196fa..69a95e772 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 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 *