diff options
| author | Sara Golemon <pollita@php.net> | 2017-01-30 09:03:01 -0800 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-01-30 09:03:01 -0800 |
| commit | f149f62d587acda7532dc356a8f60a45f819eef8 (patch) | |
| tree | 1afb7d4d5427c857efedc2f7f7b2e98765d36c0d /ext/hash | |
| parent | 46bdb637ec9cfc4cfa7e4b2518d3c6751bbb47a5 (diff) | |
| parent | 3475c0c03585463849e1d14c7ada22bee79eca5b (diff) | |
| download | php-git-f149f62d587acda7532dc356a8f60a45f819eef8.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Securely zero the hash context key
Diffstat (limited to 'ext/hash')
| -rw-r--r-- | ext/hash/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 522414839f..567c1dd387 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -889,7 +889,7 @@ static void php_hash_dtor(zend_resource *rsrc) /* {{{ */ } 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); |