From 6f3714a8fcdd0dd1831f1c165fe723f5cc238769 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Dec 2014 08:38:39 +0100 Subject: [PATCH 1/2] Fix Bug #68536 Pack for 64bits integer is broken on bigendian. Covered by ext/standard/tests/strings/pack64.phpt --- ext/standard/pack.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 9427db90a01..f42764ba3f1 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -1120,26 +1120,26 @@ PHP_MINIT_FUNCTION(pack) machine_endian_longlong_map[1] = size - 7; machine_endian_longlong_map[2] = size - 6; machine_endian_longlong_map[3] = size - 5; - machine_endian_longlong_map[0] = size - 4; - machine_endian_longlong_map[1] = size - 3; - machine_endian_longlong_map[2] = size - 2; - machine_endian_longlong_map[3] = size - 1; + machine_endian_longlong_map[4] = size - 4; + machine_endian_longlong_map[5] = size - 3; + machine_endian_longlong_map[6] = size - 2; + machine_endian_longlong_map[7] = size - 1; big_endian_longlong_map[0] = size - 8; big_endian_longlong_map[1] = size - 7; big_endian_longlong_map[2] = size - 6; big_endian_longlong_map[3] = size - 5; - big_endian_longlong_map[0] = size - 4; - big_endian_longlong_map[1] = size - 3; - big_endian_longlong_map[2] = size - 2; - big_endian_longlong_map[3] = size - 1; + big_endian_longlong_map[4] = size - 4; + big_endian_longlong_map[5] = size - 3; + big_endian_longlong_map[6] = size - 2; + big_endian_longlong_map[7] = size - 1; little_endian_longlong_map[0] = size - 1; little_endian_longlong_map[1] = size - 2; little_endian_longlong_map[2] = size - 3; little_endian_longlong_map[3] = size - 4; - little_endian_longlong_map[0] = size - 5; - little_endian_longlong_map[1] = size - 6; - little_endian_longlong_map[2] = size - 7; - little_endian_longlong_map[3] = size - 8; + little_endian_longlong_map[4] = size - 5; + little_endian_longlong_map[5] = size - 6; + little_endian_longlong_map[6] = size - 7; + little_endian_longlong_map[7] = size - 8; #endif } From 196b768928d4c64e588a0f232d229f01670695f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Dec 2014 08:40:52 +0100 Subject: [PATCH 2/2] NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index ba30d9e8e10..2afd3d30c59 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ PHP NEWS . Upgraded crypt_blowfish to version 1.3. (Leigh) . Fixed bug #60704 (unlink() bug with some files path). . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien) + . Fixed bug #68536 (pack for 64bits integer is broken on bigendian). (Remi) - cURL: . Fixed bug #67643 (curl_multi_getcontent returns '' when