diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-05-06 23:52:48 -0700 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-05-06 23:52:48 -0700 |
| commit | f7439afedaaa4ec15e1940efaa280089714d54cf (patch) | |
| tree | b00ee08c39643e2e1c215c94d0d0c7991bdaae9d | |
| parent | 197470b62f8256898adfe758302cb0241195c480 (diff) | |
| parent | 1c7f608071110a8e90e4ae04d3b4d970a70f8c7d (diff) | |
| download | php-git-f7439afedaaa4ec15e1940efaa280089714d54cf.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_strtod.c
| -rw-r--r-- | Zend/zend_strtod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c index 22d509e4a7..8a0863261b 100644 --- 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; } |