com php-src: fix hash_pbkdf2(): ext/hash/hash.c

From: Date: Thu, 28 Aug 2014 06:55:05 +0000
Subject: com php-src: fix hash_pbkdf2(): ext/hash/hash.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81245@lists.php.net to get a copy of this message
Commit: a4532f6d4d2c4f12f642abdc318dd7f38d105eca Author: Anatol Belski <ab@php.net> Thu, 28 Aug 2014 08:55:05 +0200 Parents: a038ab892ffd8ee1f808da8c5a84dfa3d06ac9f2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a4532f6d4d2c4f12f642abdc318dd7f38d105eca Log: fix hash_pbkdf2() Changed paths: M ext/hash/hash.c Diff: diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 95d1d65..5a4529d 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -603,9 +603,8 @@ PHP_FUNCTION(hash_pbkdf2) zend_string *returnval; char *algo, *salt, *pass = NULL; unsigned char *computed_salt, *digest, *temp, *result, *K1, *K2 = NULL; - zend_long loops, i, j, iterations, digest_length = 0; - size_t algo_len, pass_len, length = 0; - size_t salt_len = 0; + zend_long loops, i, j, iterations, digest_length = 0, length = 0; + size_t algo_len, pass_len, salt_len = 0; zend_bool raw_output = 0; const php_hash_ops *ops; void *context; @@ -631,7 +630,7 @@ PHP_FUNCTION(hash_pbkdf2) } if (salt_len > INT_MAX - 4) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Supplied salt is too long, max of INT_MAX - 4 bytes: %d supplied", salt_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Supplied salt is too long, max of INT_MAX - 4 bytes: %zd supplied", salt_len); RETURN_FALSE; }

« previous php.cvs (#81245) next »