database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Bug#18786138 SHA/MD5 HASHING FUNCTIONS DIE WITH "FILENAME" CHARACTER SET

Browse Source 
For charsets with no binary collation: use my_charset_bin.
This commit is contained in:
Tor Didriksen
2014-06-06 16:49:25 +02:00
parent c5c1cbc4d6
commit 5443b7a4a0
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sql/item_strfunc.cc
View File

@@ -195,16 +195,27 @@ String *Item_func_md5::val_str_ascii(String *str)
} }
void Item_func_md5::fix_length_and_dec()
{
/* /*
The MD5() function treats its parameter as being a case sensitive. Thus The MD5()/SHA() functions treat their parameter as being a case sensitive.
we set binary collation on it so different instances of MD5() will be Thus we set binary collation on it so different instances of MD5() will be
compared properly. compared properly.
*/ */
args[0]->collation.set( static CHARSET_INFO *get_checksum_charset(const char *csname)
get_charset_by_csname(args[0]->collation.collation->csname, {
MY_CS_BINSORT,MYF(0)), DERIVATION_COERCIBLE); CHARSET_INFO *cs= get_charset_by_csname(csname, MY_CS_BINSORT, MYF(0));
if (!cs)
{
// Charset has no binary collation: use my_charset_bin.
cs= &my_charset_bin;
}
return cs;
}
void Item_func_md5::fix_length_and_dec()
{
CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
args[0]->collation.set(cs, DERIVATION_COERCIBLE);
fix_length_and_charset(32, default_charset()); fix_length_and_charset(32, default_charset());
} }
@@ -239,14 +250,8 @@ String *Item_func_sha::val_str_ascii(String *str)
void Item_func_sha::fix_length_and_dec() void Item_func_sha::fix_length_and_dec()
{ {
/* CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
The SHA() function treats its parameter as being a case sensitive. Thus args[0]->collation.set(cs, DERIVATION_COERCIBLE);
we set binary collation on it so different instances of MD5() will be
compared properly.
*/
args[0]->collation.set(
get_charset_by_csname(args[0]->collation.collation->csname,
MY_CS_BINSORT,MYF(0)), DERIVATION_COERCIBLE);
// size of hex representation of hash // size of hex representation of hash
fix_length_and_charset(SHA1_HASH_SIZE * 2, default_charset()); fix_length_and_charset(SHA1_HASH_SIZE * 2, default_charset());
} }
@@ -369,18 +374,9 @@ void Item_func_sha2::fix_length_and_dec()
ER(ER_WRONG_PARAMETERS_TO_NATIVE_FCT), "sha2"); ER(ER_WRONG_PARAMETERS_TO_NATIVE_FCT), "sha2");
} }
/* CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
The SHA2() function treats its parameter as being a case sensitive. args[0]->collation.set(cs, DERIVATION_COERCIBLE);
Thus we set binary collation on it so different instances of SHA2()
will be compared properly.
*/
args[0]->collation.set(
get_charset_by_csname(
args[0]->collation.collation->csname,
MY_CS_BINSORT,
MYF(0)),
DERIVATION_COERCIBLE);
#else #else
push_warning_printf(current_thd, push_warning_printf(current_thd,
MYSQL_ERROR::WARN_LEVEL_WARN, MYSQL_ERROR::WARN_LEVEL_WARN,