1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A cleanup for MDEV-8844: Fixing compilation failure on Windows

Browse Source 
Fixing lossy type conversions:
- from int64 to int
- from size_t to uint
This commit is contained in:
Alexander Barkov 2019-12-07 18:17:08 +04:00
parent 3c6065a270
commit d30dbaa20d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_string.cc
View File

@ -781,13 +781,14 @@ void Static_binary_string::qs_append(ulonglong i)
bool Binary_string::copy_printable_hhhh(CHARSET_INFO *to_cs, bool Binary_string::copy_printable_hhhh(CHARSET_INFO *to_cs,
CHARSET_INFO *from_cs, CHARSET_INFO *from_cs,
const char *from, const char *from,
uint32 from_length) size_t from_length)
{ {
DBUG_ASSERT(from_length < UINT_MAX32);
uint errors; uint errors;
uint one_escaped_char_length= MY_CS_PRINTABLE_CHAR_LENGTH * to_cs->mbminlen; uint one_escaped_char_length= MY_CS_PRINTABLE_CHAR_LENGTH * to_cs->mbminlen;
uint one_char_length= MY_MAX(one_escaped_char_length, to_cs->mbmaxlen); uint one_char_length= MY_MAX(one_escaped_char_length, to_cs->mbmaxlen);
uint32 bytes_needed= (uint32) from_length * one_char_length; ulonglong bytes_needed= from_length * one_char_length;
if (alloc(bytes_needed)) if (bytes_needed >= UINT_MAX32 || alloc((size_t) bytes_needed))
return true; return true;
str_length= my_convert_using_func(Ptr, Alloced_length, to_cs, str_length= my_convert_using_func(Ptr, Alloced_length, to_cs,
my_wc_to_printable_generic, my_wc_to_printable_generic,

2
sql/sql_string.h
View File

@ -531,7 +531,7 @@ public:
*/ */
bool copy_printable_hhhh(CHARSET_INFO *to_cs, bool copy_printable_hhhh(CHARSET_INFO *to_cs,
CHARSET_INFO *from_cs, CHARSET_INFO *from_cs,
const char *from, uint32 from_length); const char *from, size_t from_length);
bool append_ulonglong(ulonglong val); bool append_ulonglong(ulonglong val);
bool append_longlong(longlong val); bool append_longlong(longlong val);

2
strings/ctype.c
View File

@ -1075,7 +1075,7 @@ my_wc_to_printable_generic(CHARSET_INFO *cs, my_wc_t wc,
} }
str+= cs->mbminlen; str+= cs->mbminlen;
} }
return str - str0; return (int) (str - str0);
} }