diff options
| author | Sara Golemon <pollita@php.net> | 2017-01-30 09:02:42 -0800 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-01-30 09:02:42 -0800 |
| commit | 3475c0c03585463849e1d14c7ada22bee79eca5b (patch) | |
| tree | 7c4346c5b606e4d39ded06cf2e2bf01a75bfb781 | |
| parent | de64adeb1ddd49fc763a3941792a701fef1a8132 (diff) | |
| parent | bf0f53270f3deaf53b887fbd90971d9789dc9311 (diff) | |
| download | php-git-3475c0c03585463849e1d14c7ada22bee79eca5b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Securely zero the hash context key
| -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 06c9f36705..a86297e92c 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -894,7 +894,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); |