technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing WebSocket frame retain function.

Browse Source 
Some of the pointers were not adjusted after frame's memory re-allocation.
Fortunately, this function was not used and the bug has no effect.
This commit is contained in:
Max Romanov
2020-09-10 12:16:32 +03:00
parent 22c88f0253
commit bd4ca6a057
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nxt_unit.c
View File

@@ -3288,7 +3288,7 @@ int
nxt_unit_websocket_retain(nxt_unit_websocket_frame_t *ws) nxt_unit_websocket_retain(nxt_unit_websocket_frame_t *ws)
{ {
char *b; char *b;
size_t size; size_t size, hsize;
nxt_unit_websocket_frame_impl_t *ws_impl; nxt_unit_websocket_frame_impl_t *ws_impl;
ws_impl = nxt_container_of(ws, nxt_unit_websocket_frame_impl_t, ws); ws_impl = nxt_container_of(ws, nxt_unit_websocket_frame_impl_t, ws);
@@ -3306,12 +3306,23 @@ nxt_unit_websocket_retain(nxt_unit_websocket_frame_t *ws)
memcpy(b, ws_impl->buf->buf.start, size); memcpy(b, ws_impl->buf->buf.start, size);
hsize = nxt_websocket_frame_header_size(b);
ws_impl->buf->buf.start = b; ws_impl->buf->buf.start = b;
ws_impl->buf->buf.free = b; ws_impl->buf->buf.free = b + hsize;
ws_impl->buf->buf.end = b + size; ws_impl->buf->buf.end = b + size;
ws_impl->buf->free_ptr = b; ws_impl->buf->free_ptr = b;
ws_impl->ws.header = (nxt_websocket_header_t *) b;
if (ws_impl->ws.header->mask) {
ws_impl->ws.mask = (uint8_t *) b + hsize - 4;
} else {
ws_impl->ws.mask = NULL;
}
return NXT_UNIT_OK; return NXT_UNIT_OK;
} }