cory/tildefriends
4
5
Fork 1
Code Issues 33 Pull Requests 1 Actions Releases 27 Wiki Activity

Fix/cleanup around a crash I'm seeing.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4720 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2024-01-01 22:14:27 +00:00
parent 04af1f0053
commit 197fca6d3b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http.c
View File

@ -272,16 +272,17 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d
} }
mask_start = 10; mask_start = 10;
} }
if (connection->body_length >= mask_start + length + 4) size_t total_length = mask_start + 4 + length;
if (connection->body_length >= total_length)
{ {
uint32_t mask = uint32_t mask =
(uint32_t)p[mask_start + 0] | (uint32_t)p[mask_start + 0] |
(uint32_t)p[mask_start + 1] << 8 | (uint32_t)p[mask_start + 1] << 8 |
(uint32_t)p[mask_start + 2] << 16 | (uint32_t)p[mask_start + 2] << 16 |
(uint32_t)p[mask_start + 3] << 24; (uint32_t)p[mask_start + 3] << 24;
_http_websocket_mask_in_place(p + mask_start + 4, mask, length); uint8_t* message = p + mask_start + 4;
_http_websocket_mask_in_place(message, mask, length);
const uint8_t* message = p + mask_start + 4;
if (!fin && !connection->fragment_op_code) if (!fin && !connection->fragment_op_code)
{ {
connection->fragment_op_code = op_code; connection->fragment_op_code = op_code;
@ -307,10 +308,12 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d
connection->fragment_length = 0; connection->fragment_length = 0;
} }
connection->websocket_message_index++; connection->websocket_message_index++;
size_t total_length = mask_start + 4 + length; if (connection->body_length > total_length)
{
memmove(connection->body, (char*)connection->body + total_length, connection->body_length - total_length); memmove(connection->body, (char*)connection->body + total_length, connection->body_length - total_length);
connection->body_length -= total_length; connection->body_length -= total_length;
} }
}
else else
{ {
break; break;