diff options
| author | Sammy Kaye Powers <sammyk@sammykmedia.com> | 2017-01-03 08:01:05 -0600 |
|---|---|---|
| committer | Sammy Kaye Powers <sammyk@sammykmedia.com> | 2017-01-03 08:01:05 -0600 |
| commit | 1e3624290ab30291765feca1502e8cf3aa773314 (patch) | |
| tree | 3969ef3a1cd4d8270d050b04b81143166d699224 /ext/standard/php_crypt_r.c | |
| parent | 9e29f841ce3711488781be958ffdfc42d738de4a (diff) | |
| parent | f0031ed15156e7a07983aba7a9a3155c3eb31252 (diff) | |
| download | php-git-1e3624290ab30291765feca1502e8cf3aa773314.tar.gz | |
Resolve conflict
Diffstat (limited to 'ext/standard/php_crypt_r.c')
| -rw-r--r-- | ext/standard/php_crypt_r.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c index ea2ea74fbe..4f0c26acc8 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -364,7 +364,7 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) PHP_MD5Update(&ctx, final, (unsigned int)(pl > 16 ? 16 : pl)); /* Don't leave anything around in vm they could use. */ - memset(final, 0, sizeof(final)); + ZEND_SECURE_ZERO(final, sizeof(final)); /* Then something really weird... */ for (i = pwl; i != 0; i >>= 1) |