p/liberty
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the WebSocket frame parser

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2017-02-06 19:45:03 +01:00
parent daa900e12f
commit 9afcb337ad
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
liberty-proto.c
View File

@ -1275,10 +1275,7 @@ ws_parser_push (struct ws_parser *self, const void *data, size_t len)
case WS_PARSER_PAYLOAD: case WS_PARSER_PAYLOAD:
// Move the buffer so that payload data is at the front // Move the buffer so that payload data is at the front
str_remove_slice (&self->input, 0, unpacker.offset); str_remove_slice (&self->input, 0, unpacker.offset);
// And continue unpacking frames past the payload
msg_unpacker_init (&unpacker, self->input.str, self->input.len); msg_unpacker_init (&unpacker, self->input.str, self->input.len);
unpacker.offset = self->payload_len;
if (self->input.len < self->payload_len) if (self->input.len < self->payload_len)
goto need_data; goto need_data;
@ -1287,6 +1284,8 @@ ws_parser_push (struct ws_parser *self, const void *data, size_t len)
if (!self->on_frame (self->user_data, self)) if (!self->on_frame (self->user_data, self))
goto fail; goto fail;
// And continue unpacking frames past the payload
unpacker.offset = self->payload_len;
self->state = WS_PARSER_FIXED; self->state = WS_PARSER_FIXED;
break; break;
} }