From 65bf5e88c797147c015e78f95c665ad016e50713 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 11 Sep 2016 12:47:49 +0200
Subject: [PATCH] Revert "Merge branch 'PHP-5.6' into PHP-7.0"

This reverts commit 946335ba706b7dbfe70a5fc9a1e74ee46af19cfe, reversing
changes made to 3437dbfa0097d3c5be69d4efb26a2ecb3edf5168.
---
 ext/standard/crypt.c                     |  8 --------
 ext/standard/tests/strings/bug72703.phpt | 17 -----------------
 2 files changed, 25 deletions(-)
 delete mode 100644 ext/standard/tests/strings/bug72703.phpt

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==
-
-- 
2.40.0