diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-02-13 11:16:14 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-02-13 11:16:14 +0100 |
| commit | 9ffc959e07b5d52ba70691083ac3923e484da7ff (patch) | |
| tree | 1ea7cb000c1a6579e820d0c6682d2aa3e2379d25 /php-5.4.11-conv.patch | |
| parent | bac24b9ca815ce6956e550fdbcbdf39b6dc54cf7 (diff) | |
php 5.4: sync patch with rawhide
Diffstat (limited to 'php-5.4.11-conv.patch')
| -rw-r--r-- | php-5.4.11-conv.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/php-5.4.11-conv.patch b/php-5.4.11-conv.patch new file mode 100644 index 0000000..a105d76 --- /dev/null +++ b/php-5.4.11-conv.patch @@ -0,0 +1,29 @@ +From e67a2b9e471a7bc0b774b9056bb38745b7187969 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Mon, 11 Feb 2013 09:10:51 +0100 +Subject: [PATCH] Fixed bug #64142 (dval to lval different behavior on ppc64) + +See discussion on internals +http://marc.info/?t=136042277700003&r=1&w=2 +--- + NEWS | 3 +++ + Zend/zend_operators.h | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +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; +-- +1.7.11.5 + |