Merge branch 'PHP-7.1'

* PHP-7.1:
  Securely zero the hash context key
This commit is contained in:
Sara Golemon 2017-01-30 09:03:01 -08:00
commit f149f62d58

View file

@ -889,7 +889,7 @@ static void php_hash_dtor(zend_resource *rsrc) /* {{{ */
} }
if (hash->key) { if (hash->key) {
memset(hash->key, 0, hash->ops->block_size); ZEND_SECURE_ZERO(hash->key, hash->ops->block_size);
efree(hash->key); efree(hash->key);
} }
efree(hash); efree(hash);