From cff1d39b2003470b5dcdab988e279587ae2eed8c Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Mon, 21 May 2012 00:30:45 -0400 Subject: Fix FFI struct sizing to account for trailing padding. * libguile/foreign.c (scm_sizeof): Make sure the overall size is a multiple of the alignment of the structure. * test-suite/tests/foreign.test: Test size of { double, int8 }. --- libguile/foreign.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libguile/foreign.c') diff --git a/libguile/foreign.c b/libguile/foreign.c index 00e9c7544..832913147 100644 --- a/libguile/foreign.c +++ b/libguile/foreign.c @@ -536,13 +536,14 @@ SCM_DEFINE (scm_sizeof, "sizeof", 1, 0, 0, (SCM type), { /* a struct */ size_t off = 0; + size_t align = scm_to_size_t (scm_alignof(type)); while (scm_is_pair (type)) { off = ROUND_UP (off, scm_to_size_t (scm_alignof (scm_car (type)))); off += scm_to_size_t (scm_sizeof (scm_car (type))); type = scm_cdr (type); } - return scm_from_size_t (off); + return scm_from_size_t (ROUND_UP(off, align)); } else scm_wrong_type_arg (FUNC_NAME, 1, type); -- cgit v1.2.3