diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-19 19:07:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-21 10:03:16 +0200 |
| commit | 4368efe870f225279106798f71978b68c473e2ab (patch) | |
| tree | b877d9e839890795b9f0aa051c17781deadbd404 /plugin | |
| parent | e4f70789d5bae1d3692800f55a46905517a6119b (diff) | |
| download | mariadb-git-4368efe870f225279106798f71978b68c473e2ab.tar.gz | |
valgrind failures
and a couple of collaterals:
* debugging assert in my_valgrind.h
* trivial cleanup in sql_union.cc
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/file_key_management/parser.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/file_key_management/parser.cc b/plugin/file_key_management/parser.cc index 628412bc171..b224391264c 100644 --- a/plugin/file_key_management/parser.cc +++ b/plugin/file_key_management/parser.cc @@ -333,7 +333,8 @@ char* Parser::read_and_decrypt_file(const char *secret) // Check for file encryption uchar *decrypted; - if (is_prefix((char*)buffer, OpenSSL_prefix)) + if (file_size > OpenSSL_prefix_len && + is_prefix((char*)buffer, OpenSSL_prefix)) { uchar key[OpenSSL_key_len]; uchar iv[OpenSSL_iv_len]; |