MDEV-9265 SuSE patches: Suspicious implicit sign extension

82bec8bf · Alexander Barkov · 16f0d996 · 82bec8bf
Commit 82bec8bf authored Dec 15, 2015 by Alexander Barkov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

strings/ctype-ucs2.c strings/ctype-ucs2.c +2 -1

No files found.
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1911,7 +1911,8 @@ struct charset_info_st my_charset_utf16le_bin=

 #define IS_MB4_CHAR(b0,b1,b2,b3)   (IS_UTF32_MBHEAD4(b0,b1))

-#define MY_UTF32_WC4(b0,b1,b2,b3)  ((b0 << 24) + (b1 << 16) + (b2 << 8) + (b3))
+#define MY_UTF32_WC4(b0,b1,b2,b3)  ((((my_wc_t)b0) << 24) + (b1 << 16) + \
+                                                (b2 << 8) + (b3))

 static inline int my_weight_utf32_general_ci(uchar b0, uchar b1,
                                             uchar b2, uchar b3)