mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Avoid signed overflow and use size_t in bytevectors.c.

Browse source 
* libguile/bytevectors.c (ULONG_MAX): Remove (unportable) fallback
  definition.  It is no longer used.
  (scm_make_bytevector): Use 'size_t' instead of 'unsigned' for
  indices.  Use 'scm_t_uint8' instead of 'signed char' for elements
  and c_fill.  Previously relied on GNU-C-specific behavior when
  casting integers in the range 128-255 to signed char.
  (GENERIC_INTEGER_ACCESSOR_PROLOGUE, INTEGER_LIST_TO_BYTEVECTOR)
  (scm_bytevector_eq_p, scm_bytevector_copy_x, scm_bytevector_copy)
  (scm_bytevector_to_u8_list, scm_u8_list_to_bytevector)
  (scm_bytevector_fill_x): Use 'size_t' instead of 'unsigned' for
  indices.  Use 'scm_t_uint8' for elements.
This commit is contained in:
Mark H Weaver 2014-11-12 00:35:34 -05:00
parent fdd319e9bd
commit 81d2c84674
1 changed files with 35 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

73
libguile/bytevectors.c
View file

@ -43,9 +43,6 @@
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
# include <limits.h> # include <limits.h>
#else
/* Assuming 32-bit longs. */
# define ULONG_MAX 4294967295UL
#endif #endif
#include <string.h> #include <string.h>
@ -463,10 +460,10 @@ SCM_DEFINE (scm_make_bytevector, "make-bytevector", 1, 1, 0,
#define FUNC_NAME s_scm_make_bytevector #define FUNC_NAME s_scm_make_bytevector
{ {
SCM bv; SCM bv;
unsigned c_len; size_t c_len;
signed char c_fill = '\0'; scm_t_uint8 c_fill = 0;
SCM_VALIDATE_UINT_COPY (1, len, c_len); SCM_VALIDATE_SIZE_COPY (1, len, c_len);
if (!scm_is_eq (fill, SCM_UNDEFINED)) if (!scm_is_eq (fill, SCM_UNDEFINED))
{ {
int value; int value;
@ -474,16 +471,16 @@ SCM_DEFINE (scm_make_bytevector, "make-bytevector", 1, 1, 0,
value = scm_to_int (fill); value = scm_to_int (fill);
if (SCM_UNLIKELY ((value < -128) || (value > 255))) if (SCM_UNLIKELY ((value < -128) || (value > 255)))
scm_out_of_range (FUNC_NAME, fill); scm_out_of_range (FUNC_NAME, fill);
c_fill = (signed char) value; c_fill = (scm_t_uint8) value;
} }
bv = make_bytevector (c_len, SCM_ARRAY_ELEMENT_TYPE_VU8); bv = make_bytevector (c_len, SCM_ARRAY_ELEMENT_TYPE_VU8);
if (!scm_is_eq (fill, SCM_UNDEFINED)) if (!scm_is_eq (fill, SCM_UNDEFINED))
{ {
unsigned i; size_t i;
signed char *contents; scm_t_uint8 *contents;
contents = SCM_BYTEVECTOR_CONTENTS (bv); contents = (scm_t_uint8 *) SCM_BYTEVECTOR_CONTENTS (bv);
for (i = 0; i < c_len; i++) for (i = 0; i < c_len; i++)
contents[i] = c_fill; contents[i] = c_fill;
} }
@ -510,7 +507,7 @@ SCM_DEFINE (scm_bytevector_eq_p, "bytevector=?", 2, 0, 0,
#define FUNC_NAME s_scm_bytevector_eq_p #define FUNC_NAME s_scm_bytevector_eq_p
{ {
SCM result = SCM_BOOL_F; SCM result = SCM_BOOL_F;
unsigned c_len1, c_len2; size_t c_len1, c_len2;
SCM_VALIDATE_BYTEVECTOR (1, bv1); SCM_VALIDATE_BYTEVECTOR (1, bv1);
SCM_VALIDATE_BYTEVECTOR (2, bv2); SCM_VALIDATE_BYTEVECTOR (2, bv2);
@ -538,14 +535,14 @@ SCM_DEFINE (scm_bytevector_fill_x, "bytevector-fill!", 2, 0, 0,
"Fill bytevector @var{bv} with @var{fill}, a byte.") "Fill bytevector @var{bv} with @var{fill}, a byte.")
#define FUNC_NAME s_scm_bytevector_fill_x #define FUNC_NAME s_scm_bytevector_fill_x
{ {
unsigned c_len, i; size_t c_len, i;
signed char *c_bv, c_fill; scm_t_uint8 *c_bv, c_fill;
SCM_VALIDATE_BYTEVECTOR (1, bv); SCM_VALIDATE_BYTEVECTOR (1, bv);
c_fill = scm_to_int8 (fill); c_fill = scm_to_int8 (fill);
c_len = SCM_BYTEVECTOR_LENGTH (bv); c_len = SCM_BYTEVECTOR_LENGTH (bv);
c_bv = SCM_BYTEVECTOR_CONTENTS (bv); c_bv = (scm_t_uint8 *) SCM_BYTEVECTOR_CONTENTS (bv);
for (i = 0; i < c_len; i++) for (i = 0; i < c_len; i++)
c_bv[i] = c_fill; c_bv[i] = c_fill;
@ -563,16 +560,16 @@ SCM_DEFINE (scm_bytevector_copy_x, "bytevector-copy!", 5, 0, 0,
"@var{target_start}.") "@var{target_start}.")
#define FUNC_NAME s_scm_bytevector_copy_x #define FUNC_NAME s_scm_bytevector_copy_x
{ {
unsigned c_len, c_source_len, c_target_len; size_t c_len, c_source_len, c_target_len;
unsigned c_source_start, c_target_start; size_t c_source_start, c_target_start;
signed char *c_source, *c_target; signed char *c_source, *c_target;
SCM_VALIDATE_BYTEVECTOR (1, source); SCM_VALIDATE_BYTEVECTOR (1, source);
SCM_VALIDATE_BYTEVECTOR (3, target); SCM_VALIDATE_BYTEVECTOR (3, target);
c_len = scm_to_uint (len); c_len = scm_to_size_t (len);
c_source_start = scm_to_uint (source_start); c_source_start = scm_to_size_t (source_start);
c_target_start = scm_to_uint (target_start); c_target_start = scm_to_size_t (target_start);
c_source = SCM_BYTEVECTOR_CONTENTS (source); c_source = SCM_BYTEVECTOR_CONTENTS (source);
c_target = SCM_BYTEVECTOR_CONTENTS (target); c_target = SCM_BYTEVECTOR_CONTENTS (target);
@ -598,7 +595,7 @@ SCM_DEFINE (scm_bytevector_copy, "bytevector-copy", 1, 0, 0,
#define FUNC_NAME s_scm_bytevector_copy #define FUNC_NAME s_scm_bytevector_copy
{ {
SCM copy; SCM copy;
unsigned c_len; size_t c_len;
signed char *c_bv, *c_copy; signed char *c_bv, *c_copy;
SCM_VALIDATE_BYTEVECTOR (1, bv); SCM_VALIDATE_BYTEVECTOR (1, bv);
@ -702,15 +699,15 @@ SCM_DEFINE (scm_bytevector_to_u8_list, "bytevector->u8-list", 1, 0, 0,
#define FUNC_NAME s_scm_bytevector_to_u8_list #define FUNC_NAME s_scm_bytevector_to_u8_list
{ {
SCM lst, pair; SCM lst, pair;
unsigned c_len, i; size_t c_len, i;
unsigned char *c_bv; scm_t_uint8 *c_bv;
SCM_VALIDATE_BYTEVECTOR (1, bv); SCM_VALIDATE_BYTEVECTOR (1, bv);
c_len = SCM_BYTEVECTOR_LENGTH (bv); c_len = SCM_BYTEVECTOR_LENGTH (bv);
c_bv = (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv); c_bv = (scm_t_uint8 *) SCM_BYTEVECTOR_CONTENTS (bv);
lst = scm_make_list (scm_from_uint (c_len), SCM_UNSPECIFIED); lst = scm_make_list (scm_from_size_t (c_len), SCM_UNSPECIFIED);
for (i = 0, pair = lst; for (i = 0, pair = lst;
i < c_len; i < c_len;
i++, pair = SCM_CDR (pair)) i++, pair = SCM_CDR (pair))
@ -728,13 +725,13 @@ SCM_DEFINE (scm_u8_list_to_bytevector, "u8-list->bytevector", 1, 0, 0,
#define FUNC_NAME s_scm_u8_list_to_bytevector #define FUNC_NAME s_scm_u8_list_to_bytevector
{ {
SCM bv, item; SCM bv, item;
long c_len, i; size_t c_len, i;
unsigned char *c_bv; scm_t_uint8 *c_bv;
SCM_VALIDATE_LIST_COPYLEN (1, lst, c_len); SCM_VALIDATE_LIST_COPYLEN (1, lst, c_len);
bv = make_bytevector (c_len, SCM_ARRAY_ELEMENT_TYPE_VU8); bv = make_bytevector (c_len, SCM_ARRAY_ELEMENT_TYPE_VU8);
c_bv = (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv); c_bv = (scm_t_uint8 *) SCM_BYTEVECTOR_CONTENTS (bv);
for (i = 0; i < c_len; lst = SCM_CDR (lst), i++) for (i = 0; i < c_len; lst = SCM_CDR (lst), i++)
{ {
@ -746,7 +743,7 @@ SCM_DEFINE (scm_u8_list_to_bytevector, "u8-list->bytevector", 1, 0, 0,
c_item = SCM_I_INUM (item); c_item = SCM_I_INUM (item);
if (SCM_LIKELY ((c_item >= 0) && (c_item < 256))) if (SCM_LIKELY ((c_item >= 0) && (c_item < 256)))
c_bv[i] = (unsigned char) c_item; c_bv[i] = (scm_t_uint8) c_item;
else else
goto type_error; goto type_error;
} }
@ -880,20 +877,20 @@ bytevector_large_set (char *c_bv, size_t c_size, int signed_p,
} }
#define GENERIC_INTEGER_ACCESSOR_PROLOGUE(_sign) \ #define GENERIC_INTEGER_ACCESSOR_PROLOGUE(_sign) \
unsigned long c_len, c_index, c_size; \ size_t c_len, c_index, c_size; \
char *c_bv; \ char *c_bv; \
\ \
SCM_VALIDATE_BYTEVECTOR (1, bv); \ SCM_VALIDATE_BYTEVECTOR (1, bv); \
c_index = scm_to_ulong (index); \ c_index = scm_to_size_t (index); \
c_size = scm_to_ulong (size); \ c_size = scm_to_size_t (size); \
\ \
c_len = SCM_BYTEVECTOR_LENGTH (bv); \ c_len = SCM_BYTEVECTOR_LENGTH (bv); \
c_bv = (char *) SCM_BYTEVECTOR_CONTENTS (bv); \ c_bv = (char *) SCM_BYTEVECTOR_CONTENTS (bv); \
\ \
/* C_SIZE must have its 3 higher bits set to zero so that \ /* C_SIZE must have its 3 higher bits set to zero so that \
multiplying it by 8 yields a number that fits in an \ multiplying it by 8 yields a number that fits in a \
unsigned long. */ \ size_t. */ \
if (SCM_UNLIKELY ((c_size == 0) || (c_size >= (ULONG_MAX >> 3L)))) \ if (SCM_UNLIKELY (c_size == 0 || c_size >= (SCM_I_SIZE_MAX >> 3))) \
scm_out_of_range (FUNC_NAME, size); \ scm_out_of_range (FUNC_NAME, size); \
if (SCM_UNLIKELY (c_index + c_size > c_len)) \ if (SCM_UNLIKELY (c_index + c_size > c_len)) \
scm_out_of_range (FUNC_NAME, index); scm_out_of_range (FUNC_NAME, index);
@ -1157,18 +1154,18 @@ SCM_DEFINE (scm_bytevector_to_uint_list, "bytevector->uint-list",
#define INTEGER_LIST_TO_BYTEVECTOR(_sign) \ #define INTEGER_LIST_TO_BYTEVECTOR(_sign) \
SCM bv; \ SCM bv; \
long c_len; \ size_t c_len; \
size_t c_size; \ size_t c_size; \
char *c_bv, *c_bv_ptr; \ char *c_bv, *c_bv_ptr; \
\ \
SCM_VALIDATE_LIST_COPYLEN (1, lst, c_len); \ SCM_VALIDATE_LIST_COPYLEN (1, lst, c_len); \
SCM_VALIDATE_SYMBOL (2, endianness); \ SCM_VALIDATE_SYMBOL (2, endianness); \
c_size = scm_to_uint (size); \ c_size = scm_to_size_t (size); \
\ \
if (SCM_UNLIKELY ((c_size == 0) || (c_size >= (ULONG_MAX >> 3L)))) \ if (SCM_UNLIKELY (c_size == 0 || c_size >= (SCM_I_SIZE_MAX >> 3))) \
scm_out_of_range (FUNC_NAME, size); \ scm_out_of_range (FUNC_NAME, size); \
\ \
bv = make_bytevector (c_len * c_size, SCM_ARRAY_ELEMENT_TYPE_VU8); \ bv = make_bytevector (c_len * c_size, SCM_ARRAY_ELEMENT_TYPE_VU8); \
c_bv = (char *) SCM_BYTEVECTOR_CONTENTS (bv); \ c_bv = (char *) SCM_BYTEVECTOR_CONTENTS (bv); \
\ \
for (c_bv_ptr = c_bv; \ for (c_bv_ptr = c_bv; \