diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-03-26 10:33:58 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-03-26 10:33:58 +0400 |
| commit | 6aff5fa27ae863670608ae88b134453fe53c3e17 (patch) | |
| tree | 8ecb57395fb375d71b1f8ec3df44ad3de5c27d28 /sql/item_strfunc.cc | |
| parent | a2e47f8c41e60fb0eeaa01cdd41fc07b9c963768 (diff) | |
| download | mariadb-git-6aff5fa27ae863670608ae88b134453fe53c3e17.tar.gz | |
MDEV-15619 using CONVERT() inside AES_ENCRYPT() in an UPDATE corrupts data
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 378f23f3109..e0bd3cc2195 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -379,7 +379,7 @@ String *Item_func_aes_encrypt::val_str(String *str2) DBUG_ASSERT(fixed == 1); char key_buff[80]; String tmp_key_value(key_buff, sizeof(key_buff), system_charset_info); - String *sptr= args[0]->val_str(&str_value); // String to encrypt + String *sptr= args[0]->val_str(&tmp_value); // String to encrypt String *key= args[1]->val_str(&tmp_key_value); // key int aes_length; if (sptr && key) // we need both arguments to be not NULL @@ -418,7 +418,7 @@ String *Item_func_aes_decrypt::val_str(String *str) String *sptr, *key; DBUG_ENTER("Item_func_aes_decrypt::val_str"); - sptr= args[0]->val_str(&str_value); // String to decrypt + sptr= args[0]->val_str(&tmp_value); // String to decrypt key= args[1]->val_str(&tmp_key_value); // Key if (sptr && key) // Need to have both arguments not NULL { |