Merge branch 'PHP-5.6' into PHP-7.0

Conflicts: Zend/zend_strtod.c
10 years ago · f7439afeda
1 changed files with 1 additions and 1 deletions
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@ -4416,7 +4416,7 @@ ZEND_API double zend_hex_strtod(const char *str, const char **endptr)
 	int any = 0;
 	double value = 0;

-	if (strlen(str) < 2) {
+	if (s[0] == '\0' || s[1] == '\0') {
 		if (endptr != NULL) {
 			*endptr = str;
 		}