scottmac                                 Tue, 04 Jan 2011 22:36:23 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307095

Log:
Fix bug #53632 with x87 fpu

Bug: http://bugs.php.net/53632 (Assigned) PHP hangs on numeric value 
2.2250738585072011e-308
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/Zend/zend_strtod.c
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/Zend/zend_strtod.c
    U   php/php-src/trunk/Zend/zend_strtod.c

Modified: php/php-src/branches/PHP_5_2/Zend/zend_strtod.c
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/zend_strtod.c     2011-01-04 22:01:09 UTC 
(rev 307094)
+++ php/php-src/branches/PHP_5_2/Zend/zend_strtod.c     2011-01-04 22:36:23 UTC 
(rev 307095)
@@ -2035,7 +2035,7 @@
        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;

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-04 22:01:09 UTC (rev 307094)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-04 22:36:23 UTC (rev 307095)
@@ -8,6 +8,7 @@
   . Indirect reference to $this fails to resolve if direct $this is never used
     in method. (Scott)
   . Fixed Bug #53629 (memory leak inside highlight_string()). (Hannes, Ilia)
+  . Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)

 - Core:
   . Fixed bug #48484 (array_product() always returns 0 for an empty array).

Modified: php/php-src/branches/PHP_5_3/Zend/zend_strtod.c
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/zend_strtod.c     2011-01-04 22:01:09 UTC 
(rev 307094)
+++ php/php-src/branches/PHP_5_3/Zend/zend_strtod.c     2011-01-04 22:36:23 UTC 
(rev 307095)
@@ -2035,7 +2035,7 @@
        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;

Modified: php/php-src/trunk/Zend/zend_strtod.c
===================================================================
--- php/php-src/trunk/Zend/zend_strtod.c        2011-01-04 22:01:09 UTC (rev 
307094)
+++ php/php-src/trunk/Zend/zend_strtod.c        2011-01-04 22:36:23 UTC (rev 
307095)
@@ -2035,7 +2035,7 @@
        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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to