Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle up to 2GB payload on PHP32bits #65

Merged
merged 3 commits into from
Aug 13, 2022
Merged

Handle up to 2GB payload on PHP32bits #65

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c018f30
Handle 2GB payload on PHP32bits
Domochip Dec 16, 2021
0050245
Raise error if frame is over 2GB on 32bits PHP
Domochip Jun 30, 2022
93050e6
typo
Domochip Jun 30, 2022
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
20 changes: 17 additions & 3 deletions src/Messaging/MessageBuffer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,19 @@ public function onData($data) {
$payloadLenBytes = $payload_length === 126 ? 2 : 8;
$headerSize += $payloadLenBytes;
$bytesToUpack = substr($data, $frameStart + 2, $payloadLenBytes);
$payload_length = $payload_length === 126
? unpack('n', $bytesToUpack)[1]
: unpack('J', $bytesToUpack)[1];
$payloadLenOver2GB = false;

if ($payload_length === 126){
$payload_length = unpack('n', $bytesToUpack)[1];
} else {
$payloadLenOver2GB = unpack('N', $bytesToUpack)[1] > 0; //Decode only the 4 first bytes
if (PHP_INT_SIZE == 4) { // if 32bits PHP
$bytesToUpack = substr($bytesToUpack, 4); //Keep only 4 last bytes
$payload_length = unpack('N', $bytesToUpack)[1];
Domochip marked this conversation as resolved.
Show resolved Hide resolved
} else {
$payload_length = unpack('J', $bytesToUpack)[1];
}
}
}

$closeFrame = null;
Expand All @@ -170,6 +180,10 @@ public function onData($data) {
$closeFrame = $this->newCloseFrame(Frame::CLOSE_PROTOCOL, 'Invalid frame length');
}

if (!$closeFrame && PHP_INT_SIZE == 4 && $payloadLenOver2GB) {
Domochip marked this conversation as resolved.
Show resolved Hide resolved
$closeFrame = $this->newCloseFrame(Frame::CLOSE_TOO_BIG, 'Frame over 2GB can\'t be handled on 32bits PHP');
}

if (!$closeFrame && $this->maxFramePayloadSize > 1 && $payload_length > $this->maxFramePayloadSize) {
$closeFrame = $this->newCloseFrame(Frame::CLOSE_TOO_BIG, 'Maximum frame size exceeded');
}
Expand Down