From 5f9e40a5f8a469d87fb41002c18f3a41e9c4d6b3 Mon Sep 17 00:00:00 2001 From: Sergey Glukhov Date: Thu, 23 Apr 2009 12:43:42 +0500 Subject: 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 --- sql/sql_crypt.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/sql_crypt.cc') 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); } -- cgit v1.2.1