com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/crypt.c
| From: | Anatol Belski | Date: | Mon, 29 Aug 2016 18:32:55 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/crypt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94126@lists.php.net to get a copy of this message | ||
Commit: 946335ba706b7dbfe70a5fc9a1e74ee46af19cfe
Author: Anatol Belski <ab@php.net> Mon, 29 Aug 2016 20:32:55 +0200
Parents: 3437dbfa0097d3c5be69d4efb26a2ecb3edf5168 295303b59059536079caf68b4d76acf2149bd42c
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=946335ba706b7dbfe70a5fc9a1e74ee46af19cfe
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
Bugs:
https://bugs.php.net/72703
Changed paths:
MM ext/standard/crypt.c
Diff:
diff --cc ext/standard/crypt.c
index 66b37eb,10f19ff..bca3bd1
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@@ -202,8 -196,19 +202,16 @@@ PHPAPI zend_string *php_crypt(const cha
} else if (
salt[0] == '$' &&
salt[1] == '2' &&
- salt[3] == '$' &&
- salt[4] >= '0' && salt[4] <= '3' &&
- salt[5] >= '0' && salt[5] <= '9' &&
- salt[6] == '$') {
+ salt[3] == '$') {
char output[PHP_MAX_SALT_LEN + 1];
+ int k = 7;
+
+ while (isalnum(salt[k]) || '.' == salt[k] || '/' == salt[k]) {
+ k++;
+ }
+ if (k != salt_len) {
- return FAILURE;
++ return NULL;
+ }
memset(output, 0, PHP_MAX_SALT_LEN + 1);