From: Bruno Haible Date: Sat, 5 Oct 2024 00:45:49 +0000 (+0200) Subject: iconv_open: Fix undefined behaviour. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e33e6f5414d0f903817afcad18493c1350b631d7;p=gnulib.git iconv_open: Fix undefined behaviour. Reported by Tim Sweet at . * lib/iconv.c (utf32be_mbtowc, utf32le_mbtowc): Cast 'unsigned char' values to ucs4_t before shifting them to the left. --- diff --git a/ChangeLog b/ChangeLog index fd093d60f6..46608c30ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-10-04 Bruno Haible + + iconv_open: Fix undefined behaviour. + Reported by Tim Sweet + at . + * lib/iconv.c (utf32be_mbtowc, utf32le_mbtowc): Cast 'unsigned char' + values to ucs4_t before shifting them to the left. + 2024-09-23 Bruno Haible getopt-posix: Fix compilation error in C++ mode (regression 2024-09-21). diff --git a/lib/iconv.c b/lib/iconv.c index 310f4043eb..f7a67798fb 100644 --- a/lib/iconv.c +++ b/lib/iconv.c @@ -195,7 +195,10 @@ utf32be_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n) { if (n >= 4) { - ucs4_t wc = (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + s[3]; + ucs4_t wc = ((ucs4_t) s[0] << 24) + + ((ucs4_t) s[1] << 16) + + ((ucs4_t) s[2] << 8) + + (ucs4_t) s[3]; if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000)) { *pwc = wc; @@ -237,7 +240,10 @@ utf32le_mbtowc (ucs4_t *pwc, const unsigned char *s, size_t n) { if (n >= 4) { - ucs4_t wc = s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24); + ucs4_t wc = (ucs4_t) s[0] + + ((ucs4_t) s[1] << 8) + + ((ucs4_t) s[2] << 16) + + ((ucs4_t) s[3] << 24); if (wc < 0x110000 && !(wc >= 0xd800 && wc < 0xe000)) { *pwc = wc;