diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-04-23 12:47:54 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-04-23 12:47:54 +0500 |
| commit | 9bd3ef2ebb58549f7d96dd42bbc0bbebd26ed967 (patch) | |
| tree | c69662c774992bf1aa27ab5eb472b056994f97f7 /sql/item_strfunc.cc | |
| parent | 5f9e40a5f8a469d87fb41002c18f3a41e9c4d6b3 (diff) | |
| download | mariadb-git-9bd3ef2ebb58549f7d96dd42bbc0bbebd26ed967.tar.gz | |
Bug#44365 valgrind warnings with encrypt() function
replaced String->c_ptr() with String->c_ptr_safe()
mysql-test/r/func_encrypt.result:
test result
mysql-test/t/func_encrypt.test:
test case
sql/item_strfunc.cc:
replaced String->c_ptr() with String->c_ptr_safe()
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 5bb561fc1a9..267036e4a3d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1693,10 +1693,10 @@ String *Item_func_encrypt::val_str(String *str) String *salt_str=args[1]->val_str(&tmp_value); if ((null_value= (args[1]->null_value || salt_str->length() < 2))) return 0; - salt_ptr= salt_str->c_ptr(); + salt_ptr= salt_str->c_ptr_safe(); } pthread_mutex_lock(&LOCK_crypt); - char *tmp= crypt(res->c_ptr(),salt_ptr); + char *tmp= crypt(res->c_ptr_safe(),salt_ptr); if (!tmp) { pthread_mutex_unlock(&LOCK_crypt); |