From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 7 May 2016 06:52:48 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.7RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7439afedaaa4ec15e1940efaa280089714d54cf;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	Zend/zend_strtod.c
---

f7439afedaaa4ec15e1940efaa280089714d54cf
diff --cc Zend/zend_strtod.c
index 22d509e4a7,e74cf0eb82..8a0863261b
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@@ -4416,10 -2590,8 +4416,10 @@@ ZEND_API double zend_hex_strtod(const c
  	int any = 0;
  	double value = 0;
  
- 	if (strlen(str) < 2) {
+ 	if (s[0] == '\0' || s[1] == '\0') {
 -		*endptr = str;
 +		if (endptr != NULL) {
 +			*endptr = str;
 +		}
  		return 0.0;
  	}