Bug 22842590 - PB2 VALGRIND FAILURES FOR ENCRYPTION AND KEYRING TESTS - bug fix

Author: Robert Golebiowski

plugin/keyring/buffer.h

@@ -43,6 +43,8 @@ struct Buffer
     DBUG_ASSERT(memory_size % sizeof(size_t) == 0); //make sure size is sizeof(size_t) aligned
     data= reinterpret_cast<uchar*>(new size_t[memory_size / sizeof(size_t)]);//force size_t alignment
     size= memory_size;
+    if(data)
+      memset(data, 0, size);
     position= 0;
   }
   uchar *data;

plugin/keyring/keyring.cc

@@ -187,6 +187,9 @@ my_bool mysql_key_generate(const char *key_id, const char *key_type,
     boost::movelib::unique_ptr<IKey> key_candidate(new Key(key_id, key_type, user_id, NULL, 0));
 
     boost::movelib::unique_ptr<uchar[]> key(new uchar[key_len]);
+    if (key.get() == NULL)
+      return TRUE;
+    memset(key.get(), 0, key_len);
     if (is_keys_container_initialized == FALSE || check_key_for_writting(key_candidate.get(), "generating") ||
         my_rand_buffer(key.get(), key_len))
       return TRUE;