diff options
| author | Anatol Belski <ab@php.net> | 2014-10-23 16:38:25 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-23 16:38:25 +0200 |
| commit | 4fa92438f435ea44e99bf3f4db7e8f128ce833be (patch) | |
| tree | ff3e34e1b3fcf1c8dc1f7062c3951dde3617e1ac | |
| parent | 5b9f3a24d6bc84a3d9f70c9eccc98771cc25aea5 (diff) | |
| download | php-git-4fa92438f435ea44e99bf3f4db7e8f128ce833be.tar.gz | |
fix datatype mismatches
| -rw-r--r-- | ext/standard/password.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/standard/password.c b/ext/standard/password.c index 0f75272d0e..c58c28ab3c 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -268,7 +268,7 @@ PHP_FUNCTION(password_verify) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &password, &password_len, &hash, &hash_len) == FAILURE) { RETURN_FALSE; } - if ((ret = php_crypt(password, password_len, hash, hash_len)) == NULL) { + if ((ret = php_crypt(password, (int)password_len, hash, (int)hash_len)) == NULL) { RETURN_FALSE; } @@ -298,7 +298,8 @@ PHP_FUNCTION(password_hash) { char *hash_format, *hash, *salt, *password; zend_long algo = 0; - size_t password_len = 0, hash_len; + size_t password_len = 0; + int hash_len; size_t salt_len = 0, required_salt_len = 0, hash_format_len; HashTable *options = 0; zval *option_buffer; @@ -344,7 +345,7 @@ PHP_FUNCTION(password_hash) if (options && (option_buffer = zend_symtable_str_find(options, "salt", sizeof("salt")-1)) != NULL) { char *buffer; - int buffer_len_int = 0; + size_t buffer_len_int = 0; size_t buffer_len; switch (Z_TYPE_P(option_buffer)) { case IS_STRING: @@ -425,7 +426,7 @@ PHP_FUNCTION(password_hash) /* This cast is safe, since both values are defined here in code and cannot overflow */ hash_len = (int) (hash_format_len + salt_len); - if ((result = php_crypt(password, password_len, hash, hash_len)) == NULL) { + if ((result = php_crypt(password, (int)password_len, hash, hash_len)) == NULL) { efree(hash); RETURN_FALSE; } |