php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6' into PHP-7.0

Browse Source 
Conflicts:
	Zend/zend_strtod.c
This commit is contained in:
Xinchen Hui
2016-05-06 23:52:48 -07:00
parent 197470b62f 1c7f608071
commit f7439afeda
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_strtod.c
View File

@@ -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;
}