generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-12 23:10:22 +01:00
Code Issues Projects Releases Wiki Activity

fix(Net): WebSocket receiveFrame() keeps returning the same frame when no payload (flags/header only) #4884

Browse Source
This commit is contained in:
Günter Obiltschnig 2025-02-27 20:52:02 +01:00
parent 1facbebb62
commit 7dd2024c9e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Net/src/WebSocketImpl.cpp
View File

@ -317,9 +317,9 @@ int WebSocketImpl::receiveBytes(void* buffer, int length, int)
throw WebSocketException(Poco::format("Insufficient buffer for payload size %d", payloadLength), WebSocket::WS_ERR_PAYLOAD_TOO_BIG);
}
skipHeader(_receiveState.headerLength);
_receiveState.payload.resize(payloadLength, false);
skipHeader(_receiveState.headerLength);
}
else if (_receiveState.payloadLength > length)
{
@ -364,13 +364,16 @@ int WebSocketImpl::receiveBytes(Poco::Buffer<char>& buffer, int, const Poco::Tim
payloadLength = peekHeader(_receiveState);
}
if (payloadLength <= 0)
{
skipHeader(_receiveState.headerLength);
return payloadLength;
skipHeader(_receiveState.headerLength);
}
std::size_t oldSize = buffer.size();
buffer.resize(oldSize + payloadLength);
skipHeader(_receiveState.headerLength);
if (receivePayload(buffer.begin() + oldSize, payloadLength, _receiveState.mask, _receiveState.useMask, 0) != payloadLength)
throw WebSocketException("Incomplete frame received", WebSocket::WS_ERR_INCOMPLETE_FRAME);
@ -382,11 +385,14 @@ int WebSocketImpl::receiveBytes(Poco::Buffer<char>& buffer, int, const Poco::Tim
{
int payloadLength = peekHeader(_receiveState);
if (payloadLength <= 0)
{
skipHeader(_receiveState.headerLength);
return payloadLength;
skipHeader(_receiveState.headerLength);
}
_receiveState.payload.resize(payloadLength, false);
skipHeader(_receiveState.headerLength);
}
int payloadOffset = _receiveState.payloadLength - _receiveState.remainingPayloadLength;
int n = receivePayload(_receiveState.payload.begin() + payloadOffset, _receiveState.remainingPayloadLength, _receiveState.mask, _receiveState.useMask, _receiveState.maskOffset);