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/crypt.c | |
| parent | 9e29f841ce3711488781be958ffdfc42d738de4a (diff) | |
| parent | f0031ed15156e7a07983aba7a9a3155c3eb31252 (diff) | |
| download | php-git-1e3624290ab30291765feca1502e8cf3aa773314.tar.gz | |
Resolve conflict
Diffstat (limited to 'ext/standard/crypt.c')
| -rw-r--r-- | ext/standard/crypt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index f905981cfb..f1b713ffaf 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -129,12 +129,12 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch crypt_res = php_sha512_crypt_r(password, salt, output, PHP_MAX_SALT_LEN); if (!crypt_res) { - memset(output, 0, PHP_MAX_SALT_LEN); + ZEND_SECURE_ZERO(output, PHP_MAX_SALT_LEN); efree(output); return NULL; } else { result = zend_string_init(output, strlen(output), 0); - memset(output, 0, PHP_MAX_SALT_LEN); + ZEND_SECURE_ZERO(output, PHP_MAX_SALT_LEN); efree(output); return result; } @@ -144,12 +144,12 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch crypt_res = php_sha256_crypt_r(password, salt, output, PHP_MAX_SALT_LEN); if (!crypt_res) { - memset(output, 0, PHP_MAX_SALT_LEN); + ZEND_SECURE_ZERO(output, PHP_MAX_SALT_LEN); efree(output); return NULL; } else { result = zend_string_init(output, strlen(output), 0); - memset(output, 0, PHP_MAX_SALT_LEN); + ZEND_SECURE_ZERO(output, PHP_MAX_SALT_LEN); efree(output); return result; } |