diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-04-23 12:43:42 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-04-23 12:43:42 +0500 |
| commit | 5f9e40a5f8a469d87fb41002c18f3a41e9c4d6b3 (patch) | |
| tree | 298f925620b41190de3964ef5aeb3d4c2359c97c /sql/sql_crypt.cc | |
| parent | e0526914b6acb91f8cf15bd536ad40e226158d1b (diff) | |
| download | mariadb-git-5f9e40a5f8a469d87fb41002c18f3a41e9c4d6b3.tar.gz | |
Bug#44358 valgrind errors with decode() function
The warning happens because string argument is not zero ended.
The fix is to add new parameter 'length' to SQL_CRYPT() and
use ptr() instead of c_ptr().
mysql-test/r/func_str.result:
test result
mysql-test/t/func_str.test:
test case
sql/item_strfunc.cc:
Added new parameter 'length' to SQL_CRYPT
sql/sql_crypt.cc:
Added new parameter 'length' to SQL_CRYPT
sql/sql_crypt.h:
Added new parameter 'length' to SQL_CRYPT
Diffstat (limited to 'sql/sql_crypt.cc')
| -rw-r--r-- | sql/sql_crypt.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_crypt.cc b/sql/sql_crypt.cc index aa21d429d90..c4f93cc2a33 100644 --- a/sql/sql_crypt.cc +++ b/sql/sql_crypt.cc @@ -28,10 +28,10 @@ #include "mysql_priv.h" -SQL_CRYPT::SQL_CRYPT(const char *password) +SQL_CRYPT::SQL_CRYPT(const char *password, uint length) { ulong rand_nr[2]; - hash_password(rand_nr,password, (uint) strlen(password)); + hash_password(rand_nr,password, length); crypt_init(rand_nr); } |