[PHP-CVS] com php-src: Fixed bug #62097: Zend/tests/bug62097.phpt Zend/zend_operators.c

2012-05-29 Thread Stanislav Malyshev 
Commit:78ff9ebb6bb501dff995727512c38fdeff50021b
Author:Gustavo André dos Santos Lopes  Tue, 22 
May 2012 12:36:28 +0200
Committer: Stanislav Malyshev   Wed, 23 May 2012 19:00:27 
-0500
Parents:   9ab21b15af2992ce4530623dcbe971e6f1ed3a95
Branches:  PHP-5.4.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=78ff9ebb6bb501dff995727512c38fdeff50021b

Log:
Fixed bug #62097

This fixes the fix for bug #54547 in 32-bit machines by accepting
float comparisons in 32-bit machines as long as the integer is
not larger than the mantissa.

Bugs:
https://bugs.php.net/62097
https://bugs.php.net/54547

Changed paths:
  A  Zend/tests/bug62097.phpt
  M  Zend/zend_operators.c


Diff:
diff --git a/Zend/tests/bug62097.phpt b/Zend/tests/bug62097.phpt
new file mode 100644
index 000..bee72e7
--- /dev/null
+++ b/Zend/tests/bug62097.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #62097: fix for bug #54547 is wrong for 32-bit machines
+--SKIPIF--
+ 9007199254740991. 
/*0x1F*/)
+   || (oflow1 == -1 && dval1 < -9007199254740991.))) {
+#else
if (oflow1 != 0 && oflow1 == oflow2 && dval1 - dval2 == 0.) {
+#endif
/* both values are integers overflown to the same side, 
and the
 * double comparison may have resulted in crucial 
accuracy lost */
goto string_cmp;


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

[PHP-CVS] com php-src: Fixed bug #62097: Zend/tests/bug62097.phpt Zend/zend_operators.c

2012-05-23 Thread Stanislav Malyshev 
Commit:acd711685a592c52be200e248154283c6c49c9f8
Author:Gustavo André dos Santos Lopes  Tue, 22 
May 2012 12:36:28 +0200
Committer: Stanislav Malyshev   Wed, 23 May 2012 18:55:36 
-0500
Parents:   0838a2b7c559442aac4692a023d044f34c60d24f
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=acd711685a592c52be200e248154283c6c49c9f8

Log:
Fixed bug #62097

This fixes the fix for bug #54547 in 32-bit machines by accepting
float comparisons in 32-bit machines as long as the integer is
not larger than the mantissa.

Bugs:
https://bugs.php.net/62097
https://bugs.php.net/54547

Changed paths:
  A  Zend/tests/bug62097.phpt
  M  Zend/zend_operators.c


Diff:
diff --git a/Zend/tests/bug62097.phpt b/Zend/tests/bug62097.phpt
new file mode 100644
index 000..bee72e7
--- /dev/null
+++ b/Zend/tests/bug62097.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #62097: fix for bug #54547 is wrong for 32-bit machines
+--SKIPIF--
+ 9007199254740991. 
/*0x1F*/)
+   || (oflow1 == -1 && dval1 < -9007199254740991.))) {
+#else
if (oflow1 != 0 && oflow1 == oflow2 && dval1 - dval2 == 0.) {
+#endif
/* both values are integers overflown to the same side, 
and the
 * double comparison may have resulted in crucial 
accuracy lost */
goto string_cmp;


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