[Pkg-php-commits] [php/debian-sid] Cherry pick fix for infinite loop with x87 CPU

[Ondřej Surý]

---
 .../patches/fix-infinite-loop-with-x87-cpu.patch   |   24 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/fix-infinite-loop-with-x87-cpu.patch

diff --git a/debian/patches/fix-infinite-loop-with-x87-cpu.patch b/debian/patches/fix-infinite-loop-with-x87-cpu.patch
new file mode 100644
index 0000000..7ae3400
--- /dev/null
+++ b/debian/patches/fix-infinite-loop-with-x87-cpu.patch
@@ -0,0 +1,24 @@
+--- /dev/null
++++ b/Zend/tests/bug53632.phpt
+@@ -0,0 +1,10 @@
++--TEST--
++zend_strtod() hangs with 2.2250738585072011e-308
++--FILE--
++<?php
++$d = 2.2250738585072011e-308;
++
++echo "Done\n";
++?>
++--EXPECTF--	
++Done
+--- a/Zend/zend_strtod.c
++++ b/Zend/zend_strtod.c
+@@ -2045,7 +2045,7 @@ ZEND_API double zend_strtod (CONST char
+ 	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;
diff --git a/debian/patches/series b/debian/patches/series
index 579acfb..6aa9bfa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -75,3 +75,4 @@ CVE-2010-4409.patch
 crash_in_zip_extract.patch
 unaligned_memory_access_in_hash_tiger.c.patch
 CVE-2010-4150.patch
+fix-infinite-loop-with-x87-cpu.patch
-- 
1.7.1