+2020-09-05 Bruno Haible <bruno@clisp.org>
+
+ unistr/u{8,16,32}-uctomb: Avoid possible trouble with huge strings.
+ * lib/unistr.in.h (u8_uctomb_aux, u8_uctomb, u16_uctomb_aux, u16_uctomb,
+ u32_uctomb): Change type of last argument to ptrdiff_t.
+ * lib/unistr/u8-uctomb.c (u8_uctomb): Likewise.
+ * lib/unistr/u8-uctomb-aux.c (u8_uctomb_aux): Likewise.
+ * lib/unistr/u16-uctomb.c (u16_uctomb): Likewise.
+ * lib/unistr/u16-uctomb-aux.c (u16_uctomb_aux): Likewise.
+ * lib/unistr/u32-uctomb.c (u32_uctomb): Likewise.
+
2020-09-01 Paul Eggert <eggert@cs.ucla.edu>
manywarnings: remove -Wchkp and -Wabi from C++ too
/* Get bool. */
#include <stdbool.h>
-/* Get size_t. */
+/* Get size_t, ptrdiff_t. */
#include <stddef.h>
#ifdef __cplusplus
#if GNULIB_UNISTR_U8_UCTOMB || HAVE_LIBUNISTRING
/* Auxiliary function, also used by u8_chr, u8_strchr, u8_strrchr. */
extern int
- u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n);
+ u8_uctomb_aux (uint8_t *s, ucs4_t uc, ptrdiff_t n);
# if !HAVE_INLINE
extern int
- u8_uctomb (uint8_t *s, ucs4_t uc, int n);
+ u8_uctomb (uint8_t *s, ucs4_t uc, ptrdiff_t n);
# else
static inline int
-u8_uctomb (uint8_t *s, ucs4_t uc, int n)
+u8_uctomb (uint8_t *s, ucs4_t uc, ptrdiff_t n)
{
if (uc < 0x80 && n > 0)
{
#if GNULIB_UNISTR_U16_UCTOMB || HAVE_LIBUNISTRING
/* Auxiliary function, also used by u16_chr, u16_strchr, u16_strrchr. */
extern int
- u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n);
+ u16_uctomb_aux (uint16_t *s, ucs4_t uc, ptrdiff_t n);
# if !HAVE_INLINE
extern int
- u16_uctomb (uint16_t *s, ucs4_t uc, int n);
+ u16_uctomb (uint16_t *s, ucs4_t uc, ptrdiff_t n);
# else
static inline int
-u16_uctomb (uint16_t *s, ucs4_t uc, int n)
+u16_uctomb (uint16_t *s, ucs4_t uc, ptrdiff_t n)
{
if (uc < 0xd800 && n > 0)
{
#if GNULIB_UNISTR_U32_UCTOMB || HAVE_LIBUNISTRING
# if !HAVE_INLINE
extern int
- u32_uctomb (uint32_t *s, ucs4_t uc, int n);
+ u32_uctomb (uint32_t *s, ucs4_t uc, ptrdiff_t n);
# else
static inline int
-u32_uctomb (uint32_t *s, ucs4_t uc, int n)
+u32_uctomb (uint32_t *s, ucs4_t uc, ptrdiff_t n)
{
if (uc < 0xd800 || (uc >= 0xe000 && uc < 0x110000))
{