johannes                                 Wed, 05 Jan 2011 13:32:26 +0000

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

Log:
Merge rev. 307095
- Fix bug #53632 with x87 fpu (scottmac)

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


Property changes on: php/php-src/branches/PHP_5_3_5
___________________________________________________________________
Modified: svn:mergeinfo
   - /php/php-src/trunk:284726,305015,305018-305019
   + /php/php-src/branches/PHP_5_3:307095
/php/php-src/trunk:284726,305015,305018-305019

Modified: php/php-src/branches/PHP_5_3_5/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3_5/NEWS 2011-01-05 13:26:25 UTC (rev 307118)
+++ php/php-src/branches/PHP_5_3_5/NEWS 2011-01-05 13:32:26 UTC (rev 307119)
@@ -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)

Modified: php/php-src/branches/PHP_5_3_5/Zend/zend_strtod.c
===================================================================
--- php/php-src/branches/PHP_5_3_5/Zend/zend_strtod.c   2011-01-05 13:26:25 UTC 
(rev 307118)
+++ php/php-src/branches/PHP_5_3_5/Zend/zend_strtod.c   2011-01-05 13:32:26 UTC 
(rev 307119)
@@ -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