+2019-03-09 Bruno Haible <bruno@clisp.org>
+
+ Fix undefined behaviour.
+ * lib/bitrotate.h (rotl16, rotr16, rotl8, rotr8): Case x to
+ 'unsigned int', to avoid shift operations on 'int'.
+ * lib/xmemdup0.c (xmemdup0): Don't invoke memcpy with a zero size.
+ * tests/test-count-leading-zeros.c (main): Use a random number that has
+ as many bits as TYPE, not only 2*15 or 2*31 bits.
+ * tests/test-count-trailing-zeros.c (main): Likewise.
+ * tests/test-count-one-bits.c (main): Likewise.
+ * tests/test-memmem.c: Don't include "null-ptr.h".
+ (main): Use zerosize_ptr() instead of null_ptr().
+ * modules/memmem-tests (Files): Remove tests/null-ptr.h.
+
2019-03-08 Bruno Haible <bruno@clisp.org>
unilbrk/u*-possible-linebreaks: Fix undefined behaviour.
BITROTATE_INLINE uint16_t
rotl16 (uint16_t x, int n)
{
- return ((x << n) | (x >> (16 - n))) & UINT16_MAX;
+ return (((unsigned int) x << n) | ((unsigned int) x >> (16 - n)))
+ & UINT16_MAX;
}
/* Given an unsigned 16-bit argument X, return the value corresponding
BITROTATE_INLINE uint16_t
rotr16 (uint16_t x, int n)
{
- return ((x >> n) | (x << (16 - n))) & UINT16_MAX;
+ return (((unsigned int) x >> n) | ((unsigned int) x << (16 - n)))
+ & UINT16_MAX;
}
/* Given an unsigned 8-bit argument X, return the value corresponding
BITROTATE_INLINE uint8_t
rotl8 (uint8_t x, int n)
{
- return ((x << n) | (x >> (8 - n))) & UINT8_MAX;
+ return (((unsigned int) x << n) | ((unsigned int) x >> (8 - n))) & UINT8_MAX;
}
/* Given an unsigned 8-bit argument X, return the value corresponding
BITROTATE_INLINE uint8_t
rotr8 (uint8_t x, int n)
{
- return ((x >> n) | (x << (8 - n))) & UINT8_MAX;
+ return (((unsigned int) x >> n) | ((unsigned int) x << (8 - n))) & UINT8_MAX;
}
_GL_INLINE_HEADER_END
xmemdup0 (void const *p, size_t s)
{
char *result = xcharalloc (s + 1);
- memcpy (result, p, s);
+ if (s > 0)
+ memcpy (result, p, s);
result[s] = 0;
return result;
}
Files:
tests/test-memmem.c
tests/signature.h
-tests/null-ptr.h
tests/zerosize-ptr.h
tests/macros.h
m4/mmap-anon.m4
{
int i, j;
-#define TEST_COUNT_LEADING_ZEROS(FUNC, TYPE, BITS, MAX, ONE) \
- ASSERT (FUNC (0) == BITS); \
- for (i = 0; i < BITS; i++) \
- { \
- ASSERT (FUNC (ONE << i) == BITS - i - 1); \
- for (j = 0; j < i; j++) \
- ASSERT (FUNC ((ONE << i) | (ONE << j)) == BITS - i - 1);\
- } \
- for (i = 0; i < 1000; i++) \
- { \
- TYPE value = rand () ^ (rand () << 31 << 1); \
- int count = 0; \
- for (j = 0; j < BITS; j++) \
- if (value & (ONE << j)) \
- count = BITS - j - 1; \
- ASSERT (count == FUNC (value)); \
- } \
+#define TEST_COUNT_LEADING_ZEROS(FUNC, TYPE, BITS, MAX, ONE) \
+ ASSERT (FUNC (0) == BITS); \
+ for (i = 0; i < BITS; i++) \
+ { \
+ ASSERT (FUNC (ONE << i) == BITS - i - 1); \
+ for (j = 0; j < i; j++) \
+ ASSERT (FUNC ((ONE << i) | (ONE << j)) == BITS - i - 1); \
+ } \
+ for (i = 0; i < 1000; i++) \
+ { \
+ /* RAND_MAX is most often 0x7fff or 0x7fffffff. */ \
+ TYPE value = \
+ (RAND_MAX <= 0xffff \
+ ? ((TYPE) rand () >> 3) \
+ ^ (((TYPE) rand () >> 3) << 12) \
+ ^ (((TYPE) rand () >> 3) << 24) \
+ ^ (((TYPE) rand () >> 3) << 30 << 6) \
+ ^ (((TYPE) rand () >> 3) << 30 << 18) \
+ ^ (((TYPE) rand () >> 3) << 30 << 30) \
+ : ((TYPE) rand () >> 3) \
+ ^ (((TYPE) rand () >> 3) << 22) \
+ ^ (((TYPE) rand () >> 3) << 22 << 22)); \
+ int count = 0; \
+ for (j = 0; j < BITS; j++) \
+ if (value & (ONE << j)) \
+ count = BITS - j - 1; \
+ ASSERT (count == FUNC (value)); \
+ } \
ASSERT (FUNC (MAX) == 0);
TEST_COUNT_LEADING_ZEROS (count_leading_zeros, unsigned int,
{
int i, j;
-#define TEST_COUNT_ONE_BITS(FUNC, TYPE, BITS, MAX, ONE) \
- ASSERT (FUNC (0) == 0); \
- for (i = 0; i < BITS; i++) \
- { \
- ASSERT (FUNC (ONE << i) == 1); \
- for (j = i + 1; j < BITS; j++) \
- ASSERT (FUNC ((ONE << i) | (ONE << j)) == 2); \
- } \
- for (i = 0; i < 1000; i++) \
- { \
- TYPE value = rand () ^ (rand () << 31 << 1); \
- int count = 0; \
- for (j = 0; j < BITS; j++) \
- count += (value & (ONE << j)) != 0; \
- ASSERT (count == FUNC (value)); \
- } \
+#define TEST_COUNT_ONE_BITS(FUNC, TYPE, BITS, MAX, ONE) \
+ ASSERT (FUNC (0) == 0); \
+ for (i = 0; i < BITS; i++) \
+ { \
+ ASSERT (FUNC (ONE << i) == 1); \
+ for (j = i + 1; j < BITS; j++) \
+ ASSERT (FUNC ((ONE << i) | (ONE << j)) == 2); \
+ } \
+ for (i = 0; i < 1000; i++) \
+ { \
+ /* RAND_MAX is most often 0x7fff or 0x7fffffff. */ \
+ TYPE value = \
+ (RAND_MAX <= 0xffff \
+ ? ((TYPE) rand () >> 3) \
+ ^ (((TYPE) rand () >> 3) << 12) \
+ ^ (((TYPE) rand () >> 3) << 24) \
+ ^ (((TYPE) rand () >> 3) << 30 << 6) \
+ ^ (((TYPE) rand () >> 3) << 30 << 18) \
+ ^ (((TYPE) rand () >> 3) << 30 << 30) \
+ : ((TYPE) rand () >> 3) \
+ ^ (((TYPE) rand () >> 3) << 22) \
+ ^ (((TYPE) rand () >> 3) << 22 << 22)); \
+ int count = 0; \
+ for (j = 0; j < BITS; j++) \
+ count += (value & (ONE << j)) != 0; \
+ ASSERT (count == FUNC (value)); \
+ } \
ASSERT (FUNC (MAX) == BITS);
TEST_COUNT_ONE_BITS (count_one_bits, unsigned int, UINT_BIT, UINT_MAX, 1U);
{
int i, j;
-#define TEST_COUNT_TRAILING_ZEROS(FUNC, TYPE, BITS, MAX, ONE) \
- ASSERT (FUNC (0) == BITS); \
- for (i = 0; i < BITS; i++) \
- { \
- ASSERT (FUNC (ONE << i) == i); \
- for (j = 0; j < i; j++) \
- ASSERT (FUNC ((ONE << i) | (ONE << j)) == j); \
- } \
- for (i = 0; i < 1000; i++) \
- { \
- TYPE value = rand () ^ (rand () << 31 << 1); \
- int count = 0; \
- for (j = BITS - 1; 0 <= j; j--) \
- if (value & (ONE << j)) \
- count = j; \
- ASSERT (count == FUNC (value)); \
- } \
+#define TEST_COUNT_TRAILING_ZEROS(FUNC, TYPE, BITS, MAX, ONE) \
+ ASSERT (FUNC (0) == BITS); \
+ for (i = 0; i < BITS; i++) \
+ { \
+ ASSERT (FUNC (ONE << i) == i); \
+ for (j = 0; j < i; j++) \
+ ASSERT (FUNC ((ONE << i) | (ONE << j)) == j); \
+ } \
+ for (i = 0; i < 1000; i++) \
+ { \
+ /* RAND_MAX is most often 0x7fff or 0x7fffffff. */ \
+ TYPE value = \
+ (RAND_MAX <= 0xffff \
+ ? ((TYPE) rand () >> 3) \
+ ^ (((TYPE) rand () >> 3) << 12) \
+ ^ (((TYPE) rand () >> 3) << 24) \
+ ^ (((TYPE) rand () >> 3) << 30 << 6) \
+ ^ (((TYPE) rand () >> 3) << 30 << 18) \
+ ^ (((TYPE) rand () >> 3) << 30 << 30) \
+ : ((TYPE) rand () >> 3) \
+ ^ (((TYPE) rand () >> 3) << 22) \
+ ^ (((TYPE) rand () >> 3) << 22 << 22)); \
+ int count = 0; \
+ for (j = BITS - 1; 0 <= j; j--) \
+ if (value & (ONE << j)) \
+ count = j; \
+ ASSERT (count == FUNC (value)); \
+ } \
ASSERT (FUNC (MAX) == 0);
TEST_COUNT_TRAILING_ZEROS (count_trailing_zeros, unsigned int,
#include <stdlib.h>
#include <unistd.h>
-#include "null-ptr.h"
#include "zerosize-ptr.h"
#include "macros.h"
{
const char input[] = "foo";
- const char *result = memmem (input, strlen (input), null_ptr (), 0);
+ const char *result = memmem (input, strlen (input), zerosize_ptr (), 0);
ASSERT (result == input);
}