Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/standard/pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ PHP_FUNCTION(unpack)


if (offset < 0 || offset > inputlen) {
zend_argument_value_error(3, "must be contained in argument #2 ($data)");
zend_argument_value_error(3, "must be contained in argument #2 ($string)");
RETURN_THROWS();
}

Expand Down
12 changes: 10 additions & 2 deletions ext/standard/tests/strings/unpack_offset.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,17 @@ try {
} catch (Throwable $e) {
echo $e::class, ': ', $e->getMessage(), "\n";
}

/* the message names argument #2, so that name has to be the real one */
foreach ((new ReflectionFunction('unpack'))->getParameters() as $parameter) {
echo '$', $parameter->getName(), "\n";
}
?>
--EXPECT--
0x01020304 0x05060708
0x01020304 0x05060708
ValueError: unpack(): Argument #3 ($offset) must be contained in argument #2 ($data)
ValueError: unpack(): Argument #3 ($offset) must be contained in argument #2 ($data)
ValueError: unpack(): Argument #3 ($offset) must be contained in argument #2 ($string)
ValueError: unpack(): Argument #3 ($offset) must be contained in argument #2 ($string)
$format
$string
$offset
Loading