LibreOffice/online
1
0
Fork 0
mirror of https://github.com/LibreOffice/online.git synced 2025-08-13 13:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid taking address over the end of a vector if reading 0 bytes.

Browse Source 
Happens with some close frames eg.

[ docbroker_001 ] TRC  #21: Incoming WebSocket data of 6 bytes: 88 80 4a 2c 44 f9  | ..J,D.|

    fin = true
    OpCode is Close (= 0x8)
    hasMask = true
    payloadLen = 0
    headerLen = 2 -> 6 after hasMask is taken into account.

Change-Id: I0e212e4589c3cc63db16f7065dc90cd0bd539ada
This commit is contained in:
Michael Meeks
2020-01-06 15:10:02 +00:00
parent 9cef0f385d
commit 7788bd9268
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/WebSocketHandler.hpp
View File

@ -607,6 +607,9 @@ protected:
void readPayload(unsigned char *data, size_t dataLen, unsigned char* mask, std::vector<char>& payload)
{
if (dataLen == 0)
return;
if (mask)
{
size_t end = payload.size();