clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

correction for previous fix to bug #38770 (pack/unpack is broken on 64bit)

Browse Source 
fix pack test, correct space to tabs
This commit is contained in:
Brian Shire 2007-04-03 19:50:40 +00:00
parent 0291924222
commit bd4add59f7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/standard/pack.c
View File

@ -760,7 +760,7 @@ PHP_FUNCTION(unpack)
issigned = input[inputpos + (machine_little_endian ? (sizeof(int) - 1) : 0)] & 0x80;
} else if (sizeof(long) > 4 && (input[inputpos + machine_endian_long_map[3]] & 0x80) == 0x80) {
v = ~INT_MAX;
}
}
v |= php_unpack(&input[inputpos], sizeof(int), issigned, int_map);
add_assoc_long(return_value, n, v);
@ -775,15 +775,17 @@ PHP_FUNCTION(unpack)
int *map = machine_endian_long_map;
long v = 0;
if (type == 'l') {
if (type == 'l' || type == 'L') {
issigned = input[inputpos + (machine_little_endian ? 3 : 0)] & 0x80;
} else if (type == 'N') {
issigned = input[inputpos] & 0x80;
map = big_endian_long_map;
} else if (type == 'V') {
issigned = input[inputpos + 3] & 0x80;
map = little_endian_long_map;
}
if (sizeof(long) > 4 && (input[inputpos + machine_endian_long_map[3]] & 0x80) == 0x80) {
if (sizeof(long) > 4 && issigned) {
v = ~INT_MAX;
}

8
ext/standard/tests/strings/pack.phpt
View File

@ -145,7 +145,7 @@ Array
)
Array
(
[1] => 0
[1] => -1
)
Array
(
@ -185,7 +185,7 @@ Array
)
Array
(
[1] => 0
[1] => -1
)
Array
(
@ -233,7 +233,7 @@ Array
)
Array
(
[1] => 0
[1] => -1
)
Array
(
@ -305,7 +305,7 @@ Array
)
Array
(
[1] => 0
[1] => -1
)
Array
(