com php-src: Fixed bug #64142 (dval to lval different behavior on ppc64): NEWS Zend/zend_operators.h
| From: | Remi Collet | Date: | Mon, 11 Feb 2013 08:10:51 +0000 |
| Subject: | com php-src: Fixed bug #64142 (dval to lval different behavior on ppc64): NEWS Zend/zend_operators.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71205@lists.php.net to get a copy of this message | ||
Commit: e67a2b9e471a7bc0b774b9056bb38745b7187969
Author: Remi Collet <remi@php.net> Mon, 11 Feb 2013 09:10:51 +0100
Parents: bfdb889d4f4cdc1c602db70f956726235778aac3
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e67a2b9e471a7bc0b774b9056bb38745b7187969
Log:
Fixed bug #64142 (dval to lval different behavior on ppc64)
See discussion on internals
http://marc.info/?t=136042277700003&r=1&w=2
Bugs:
https://bugs.php.net/64142
Changed paths:
M NEWS
M Zend/zend_operators.h
Diff:
diff --git a/NEWS b/NEWS
index f205f3b..4bdd8c3 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 02a96dd..047b92e 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;