diff options
| author | Remi Collet <remi@php.net> | 2014-12-02 08:41:35 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-12-02 08:41:35 +0100 |
| commit | 8199278ffb2a2a16bcec191455f38d37fa3a292d (patch) | |
| tree | 953dbd12ddbe9d8c603e99e463e65b2e6967c62d | |
| parent | 9aabfeb6c40f97c473d41057199c7818c2cf96ce (diff) | |
| parent | 196b768928d4c64e588a0f232d229f01670695f6 (diff) | |
| download | php-git-8199278ffb2a2a16bcec191455f38d37fa3a292d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
| -rw-r--r-- | ext/standard/pack.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 85709bc9f1..f773eb26c5 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -1105,26 +1105,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 } |