sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_http_websocket: ensure control frames do not interfere with data" into 16

This commit is contained in:
George Joseph 2019-01-28 07:22:18 -06:00 committed by Gerrit Code Review
parent e994dff064 907d71b551
commit 47a2b6d0f3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
res/res_http_websocket.c
View File

@ -632,9 +632,17 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha
}
/* Per the RFC for PING we need to send back an opcode with the application data as received */
if ((*opcode == AST_WEBSOCKET_OPCODE_PING) && (ast_websocket_write(session, AST_WEBSOCKET_OPCODE_PONG, *payload, *payload_len))) {
if (*opcode == AST_WEBSOCKET_OPCODE_PING) {
if (ast_websocket_write(session, AST_WEBSOCKET_OPCODE_PONG, *payload, *payload_len)) {
ast_websocket_close(session, 1009);
}
*payload_len = 0;
return 0;
}
/* Stop PONG processing here */
if (*opcode == AST_WEBSOCKET_OPCODE_PONG) {
*payload_len = 0;
ast_websocket_close(session, 1009);
return 0;
}
@ -648,6 +656,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha
return 0;
}
/* Below this point we are handling TEXT, BINARY or CONTINUATION opcodes */
if (*payload_len) {
if (!(new_payload = ast_realloc(session->payload, (session->payload_len + *payload_len)))) {
ast_log(LOG_WARNING, "Failed allocation: %p, %zu, %"PRIu64"\n",