summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-02-11 09:10:51 +0100
committerRemi Collet <remi@php.net>2013-02-11 09:10:51 +0100
commite67a2b9e471a7bc0b774b9056bb38745b7187969 (patch)
treeed8bcae482e018ef4a2e234dce8eb318f6020175
parentbfdb889d4f4cdc1c602db70f956726235778aac3 (diff)
downloadphp-git-e67a2b9e471a7bc0b774b9056bb38745b7187969.tar.gz
Fixed bug #64142 (dval to lval different behavior on ppc64)
See discussion on internals http://marc.info/?t=136042277700003&r=1&w=2
-rw-r--r--NEWS3
-rw-r--r--Zend/zend_operators.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f205f3b86c..4bdd8c3bac 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2012, PHP 5.4.13
+- Core:
+ . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
+
- CLI server:
. Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi)
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 02a96dd26e..047b92e3ba 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -79,7 +79,8 @@ static zend_always_inline long zend_dval_to_lval(double d)
#else
static zend_always_inline long zend_dval_to_lval(double d)
{
- if (d > LONG_MAX) {
+ /* >= as (double)LONG_MAX is outside signed range */
+ if (d >= LONG_MAX) {
return (long)(unsigned long) d;
}
return (long) d;