diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-09-01 23:53:58 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-09-01 23:53:58 +0200 |
commit | d7e7a02a6251c8ed4f76933d9d30baeee3f599c0 (patch) | |
tree | 090c38e239a5a48501a3826552b8842c9bdb1d82 /libguile/srfi-4.i.c | |
parent | ba54a2026beaadb4e7566d4b9e2c9e4c7cd793e6 (diff) | |
download | guile-d7e7a02a6251c8ed4f76933d9d30baeee3f599c0.tar.gz |
Fix leaky behavior of `scm_take_TAGvector ()'.
* libguile/srfi-4.c (free_user_data): New function.
* libguile/srfi-4.i.c (scm_take_TAGvector): Register `free_user_data ()'
as a finalizer for DATA.
* libguile/objcodes.c (scm_objcode_to_bytecode): Allocate with
`scm_malloc ()' since the memory taken by `scm_take_u8vector ()' will
eventually be free(3)d.
* libguile/vm.c (really_make_boot_program): Likewise.
Diffstat (limited to 'libguile/srfi-4.i.c')
-rw-r--r-- | libguile/srfi-4.i.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libguile/srfi-4.i.c b/libguile/srfi-4.i.c index cecd6c638..098752ef2 100644 --- a/libguile/srfi-4.i.c +++ b/libguile/srfi-4.i.c @@ -126,8 +126,16 @@ SCM_DEFINE (F(scm_list_to_,TAG,vector), "list->"S(TAG)"vector", 1, 0, 0, SCM F(scm_take_,TAG,vector) (CTYPE *data, size_t n) { - scm_gc_register_collectable_memory ((void *)data, n*uvec_sizes[TYPE], - uvec_names[TYPE]); + /* The manual says "Return a new uniform numeric vector [...] that uses the + memory pointed to by DATA". We *have* to use DATA as the underlying + storage; thus we must register a finalizer to eventually free(3) it. */ + GC_finalization_proc prev_finalizer; + GC_PTR prev_finalization_data; + + GC_REGISTER_FINALIZER_NO_ORDER (data, free_user_data, 0, + &prev_finalizer, + &prev_finalization_data); + return take_uvec (TYPE, data, n); } |