diff options
| author | Anatol Belski <ab@php.net> | 2016-09-11 12:47:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-09-11 12:59:43 +0200 |
| commit | 65bf5e88c797147c015e78f95c665ad016e50713 (patch) | |
| tree | b24eb5dda6438cc0274c925f35728270a9c49b6b | |
| parent | 2970630133dc22a364f258a0b25ed71be260af24 (diff) | |
| download | php-git-65bf5e88c797147c015e78f95c665ad016e50713.tar.gz | |
Revert "Merge branch 'PHP-5.6' into PHP-7.0"
This reverts commit 946335ba706b7dbfe70a5fc9a1e74ee46af19cfe, reversing
changes made to 3437dbfa0097d3c5be69d4efb26a2ecb3edf5168.
| -rw-r--r-- | ext/standard/crypt.c | 8 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug72703.phpt | 17 |
2 files changed, 0 insertions, 25 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index bca3bd1363..66b37eb79e 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -204,14 +204,6 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch salt[1] == '2' && 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 NULL; - } memset(output, 0, PHP_MAX_SALT_LEN + 1); diff --git a/ext/standard/tests/strings/bug72703.phpt b/ext/standard/tests/strings/bug72703.phpt deleted file mode 100644 index 5e3bf4875d..0000000000 --- a/ext/standard/tests/strings/bug72703.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -Bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify ---SKIPIF-- -<?php -if (!function_exists('crypt'))) { - die("SKIP crypt() is not available"); -} -?> ---FILE-- -<?php - var_dump(password_verify("","$2y$10$$")); -?> -==OK== ---EXPECT-- -bool(false) -==OK== - |