mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #38770 (unpack() broken with longs on 64 bit machines).

Browse Source
This commit is contained in:
Ilia Alshanetsky 2006-11-19 18:20:48 +00:00
parent c06f9e1efe
commit 0d338f463c
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -74,6 +74,8 @@ PHP NEWS
(Dmitry)
- Fixed bug #39090 (DirectoryFilterDots doxygen docs and example is wrong).
(Marcus)
- Fixed bug #38770 (unpack() broken with longs on 64 bit machines). (Ilia,
David Soria Parra).
- Fixed bug #38698 (for some keys cdbmake creates corrupted db and cdb can't
read valid db). (Marcus)
- Fixed bug #38680 (Added missing handling of basic types in json_decode).

16
ext/standard/pack.c
View File

@ -753,14 +753,16 @@ PHP_FUNCTION(unpack)
case 'i':
case 'I': {
long v;
long v = 0;
int issigned = 0;
if (type == 'i') {
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);
v |= php_unpack(&input[inputpos], sizeof(int), issigned, int_map);
add_assoc_long(return_value, n, v);
break;
}
@ -771,7 +773,7 @@ PHP_FUNCTION(unpack)
case 'V': {
int issigned = 0;
int *map = machine_endian_long_map;
long v;
long v = 0;
if (type == 'l') {
issigned = input[inputpos + (machine_little_endian ? 3 : 0)] & 0x80;
@ -781,7 +783,11 @@ PHP_FUNCTION(unpack)
map = little_endian_long_map;
}
v = php_unpack(&input[inputpos], 4, issigned, map);
if (sizeof(long) > 4 && (input[inputpos + machine_endian_long_map[3]] & 0x80) == 0x80) {
v = ~INT_MAX;
}
v |= php_unpack(&input[inputpos], 4, issigned, map);
add_assoc_long(return_value, n, v);
break;
}

25
ext/standard/tests/strings/bug38770.phpt Normal file
View File

@ -0,0 +1,25 @@
--TEST--
Bug #38770 (unpack() broken with longs on 64 bit machines)
--FILE--
<?php
foreach (array('N','I','l') as $v) {
print_r(unpack($v, pack($v, -30000)));
}
echo "Done\n";
?>
--EXPECT--
Array
(
[1] => -30000
)
Array
(
[1] => -30000
)
Array
(
[1] => -30000
)
Done