From: Scott MacVicar <scottmac@php.net>
Date: Tue, 4 Jan 2011 22:36:23 +0000 (+0000)
Subject: Fix bug #53632 with x87 fpu
X-Git-Tag: php-5.3.6RC1~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66753ff6c758703d2c681d27496ed9ddbe8f33b7;p=php

Fix bug #53632 with x87 fpu
---

diff --git a/NEWS b/NEWS
index e3f181021f..8cd674e669 100644
--- a/NEWS
+++ b/NEWS
@@ -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).
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;