From: Bruno Haible Date: Fri, 8 Mar 2019 23:01:47 +0000 (+0100) Subject: unistr/*, uniconv/*: Fix undefined behaviour. X-Git-Tag: v1.0~5051 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=f6f567a94d1f34b96ae05e2354bfaa994c9de840;p=gnulib.git unistr/*, uniconv/*: Fix undefined behaviour. Reported by Jeffrey Walton . * lib/unistr/u-cpy.h (FUNC): Don't invoke memcpy with a zero size. * lib/unistr/u-cpy-alloc.h (FUNC): Likewise. * lib/uniconv/u8-conv-from-enc.c (u8_conv_from_encoding): Likewise. * lib/uniconv/u8-conv-to-enc.c (u8_conv_to_encoding): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 074b1caca4..687357e614 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2019-03-08 Bruno Haible + + unistr/*, uniconv/*: Fix undefined behaviour. + Reported by Jeffrey Walton . + * lib/unistr/u-cpy.h (FUNC): Don't invoke memcpy with a zero size. + * lib/unistr/u-cpy-alloc.h (FUNC): Likewise. + * lib/uniconv/u8-conv-from-enc.c (u8_conv_from_encoding): Likewise. + * lib/uniconv/u8-conv-to-enc.c (u8_conv_to_encoding): Likewise. + 2019-03-08 Bruno Haible unistr/u8-cmp: Fix undefined behaviour. diff --git a/lib/uniconv/u8-conv-from-enc.c b/lib/uniconv/u8-conv-from-enc.c index 623dc1f9a2..f8e9bd920f 100644 --- a/lib/uniconv/u8-conv-from-enc.c +++ b/lib/uniconv/u8-conv-from-enc.c @@ -77,7 +77,8 @@ u8_conv_from_encoding (const char *fromcode, } } - memcpy ((char *) result, src, srclen); + if (srclen > 0) + memcpy ((char *) result, src, srclen); *lengthp = srclen; return result; } diff --git a/lib/uniconv/u8-conv-to-enc.c b/lib/uniconv/u8-conv-to-enc.c index ff0bc644b8..56e312198f 100644 --- a/lib/uniconv/u8-conv-to-enc.c +++ b/lib/uniconv/u8-conv-to-enc.c @@ -60,7 +60,8 @@ u8_conv_to_encoding (const char *tocode, } } - memcpy (result, (const char *) src, srclen); + if (srclen > 0) + memcpy (result, (const char *) src, srclen); *lengthp = srclen; return result; } diff --git a/lib/unistr/u-cpy-alloc.h b/lib/unistr/u-cpy-alloc.h index 8afa66b37d..55fef325bf 100644 --- a/lib/unistr/u-cpy-alloc.h +++ b/lib/unistr/u-cpy-alloc.h @@ -33,7 +33,8 @@ FUNC (const UNIT *s, size_t n) for (; n > 0; n--) *destptr++ = *s++; #else - memcpy ((char *) dest, (const char *) s, n * sizeof (UNIT)); + if (n > 0) + memcpy ((char *) dest, (const char *) s, n * sizeof (UNIT)); #endif } return dest; diff --git a/lib/unistr/u-cpy.h b/lib/unistr/u-cpy.h index 1dc2129720..c023a27339 100644 --- a/lib/unistr/u-cpy.h +++ b/lib/unistr/u-cpy.h @@ -26,7 +26,8 @@ FUNC (UNIT *dest, const UNIT *src, size_t n) for (; n > 0; n--) *destptr++ = *src++; #else - memcpy ((char *) dest, (const char *) src, n * sizeof (UNIT)); + if (n > 0) + memcpy ((char *) dest, (const char *) src, n * sizeof (UNIT)); #endif return dest; }