From b0fae4ecaa9f602f3183c35eb945c8050e1f3b68 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 16 Oct 2009 11:59:30 +0200 Subject: bitvector tweaks * libguile/arrays.c (scm_from_contiguous_typed_array): * libguile/bytevectors.c (scm_uniform_array_to_bytevector): Error if the uniform element size is more than 8 bits, but not divisible by 8 -- because our math could overflow in that case. * module/ice-9/deprecated.scm (#\y): Indeed, #* is the valid bitvector syntax :) --- libguile/arrays.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libguile/arrays.c') diff --git a/libguile/arrays.c b/libguile/arrays.c index 1fd6d9245..8dc1d7888 100644 --- a/libguile/arrays.c +++ b/libguile/arrays.c @@ -241,12 +241,15 @@ scm_from_contiguous_typed_array (SCM type, SCM bounds, const void *bytes, if (byte_len / (sz / 8) != rlen) SCM_MISC_ERROR ("byte length and dimensions do not match", SCM_EOL); } - else + else if (sz < 8) { /* byte_len ?= ceil (rlen * sz / 8) */ if (byte_len != (rlen * sz + 7) / 8) SCM_MISC_ERROR ("byte length and dimensions do not match", SCM_EOL); } + else + /* an internal guile error, really */ + SCM_MISC_ERROR ("uniform elements larger than 8 bits must fill whole bytes", SCM_EOL); memcpy (elts, bytes, byte_len); -- cgit v1.2.3