From c0c1ee9f77d41298cd3b576fdf8b97e5d8d87e17 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Jun 2011 08:39:24 -0700 Subject: [PATCH] * alloc.c (Fmake_bool_vector): Avoid unnecessary multiplication. --- src/ChangeLog | 2 ++ src/alloc.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b9cf18cedd..80626bc0c2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-18 Paul Eggert + * alloc.c (Fmake_bool_vector): Avoid unnecessary multiplication. + * fns.c (concat): Catch string overflow earlier. Do not rely on integer wraparound. diff --git a/src/alloc.c b/src/alloc.c index 00d330c1b6..69623d103c 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -2257,12 +2257,14 @@ LENGTH must be a number. INIT matters only in whether it is t or nil. */) p = XBOOL_VECTOR (val); p->size = XFASTINT (length); - memset (p->data, NILP (init) ? 0 : -1, length_in_chars); + if (length_in_chars) + { + memset (p->data, ! NILP (init) ? -1 : 0, length_in_chars); - /* Clear the extraneous bits in the last byte. */ - if (XINT (length) != length_in_chars * BOOL_VECTOR_BITS_PER_CHAR) - p->data[length_in_chars - 1] - &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1; + /* Clear any extraneous bits in the last byte. */ + p->data[length_in_chars - 1] + &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1; + } return val; } -- 2.20.1