summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-12-15 10:57:28 +0400
committerAlexander Barkov <bar@mariadb.org>2015-12-15 10:57:28 +0400
commitaf3c67056d3f9f7f348c612f9ce48e83c8a456d6 (patch)
tree4f08b4eb21e935e5eb7bef4eb971101b370047b1 /strings
parent99404c3437b35b5ee51578c2ea74209ccb9ba890 (diff)
downloadmariadb-git-af3c67056d3f9f7f348c612f9ce48e83c8a456d6.tar.gz
MDEV-9265 SuSE patches: Suspicious implicit sign extension
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-ucs2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 593f9a12950..bd1e74becaa 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -1932,7 +1932,7 @@ my_utf32_uni(CHARSET_INFO *cs __attribute__((unused)),
{
if (s + 4 > e)
return MY_CS_TOOSMALL4;
- *pwc= (s[0] << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);
+ *pwc= (((my_wc_t) s[0]) << 24) + (s[1] << 16) + (s[2] << 8) + (s[3]);
return 4;
}