diff options
| author | Johannes Schlüter <johannes@php.net> | 2011-01-05 13:32:26 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2011-01-05 13:32:26 +0000 |
| commit | 57bf3eb6ca87ee7e8cdd4a4d261438407ab8ec7a (patch) | |
| tree | 3087b12a30451524eadf1c3f82dc02e8ee574b3b | |
| parent | 0e9fe5a2c294ef54556ce1658680da08c1f3d78e (diff) | |
| download | php-git-57bf3eb6ca87ee7e8cdd4a4d261438407ab8ec7a.tar.gz | |
Merge rev. 307095
- Fix bug #53632 with x87 fpu (scottmac)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Zend/zend_strtod.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2011, PHP 5.3.5 +- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus) + 09 Dec 2010, PHP 5.3.4 - Upgraded bundled Sqlite3 to version 3.7.3. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c index bc2ca97b19..311d4385d3 100644 --- a/Zend/zend_strtod.c +++ b/Zend/zend_strtod.c @@ -2035,7 +2035,7 @@ ZEND_API double zend_strtod (CONST char *s00, char **se) int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; CONST char *s, *s0, *s1; - double aadj, aadj1, adj; + volatile double aadj, aadj1, adj; volatile _double rv, rv0; Long L; ULong y, z; |