kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "AST-2018-006: Properly handle WebSocket frames with 0 length payload."

Browse Source
This commit is contained in:
Kevin Harwell
2018-02-21 14:11:50 -06:00
committed by Gerrit Code Review
parent bd549cf936 6436137959
commit 2220be2349
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_http_websocket.c
View File

@@ -488,13 +488,20 @@ const char * AST_OPTIONAL_API_NAME(ast_websocket_session_id)(struct ast_websocke
* Note during the header parsing stage we try to read in small chunks just what we need, this
* is buffered data anyways, no expensive syscall required most of the time ...
*/
static inline int ws_safe_read(struct ast_websocket *session, char *buf, int len, enum ast_websocket_opcode *opcode)
static inline int ws_safe_read(struct ast_websocket *session, char *buf, size_t len, enum ast_websocket_opcode *opcode)
{
ssize_t rlen;
int xlen = len;
char *rbuf = buf;
int sanity = 10;
ast_assert(len > 0);
if (!len) {
errno = EINVAL;
return -1;
}
ao2_lock(session);
if (!session->stream) {
ao2_unlock(session);
@@ -608,9 +615,12 @@ int AST_OPTIONAL_API_NAME(ast_websocket_read)(struct ast_websocket *session, cha
return -1;
}
if (ws_safe_read(session, *payload, *payload_len, opcode)) {
return -1;
if (*payload_len) {
if (ws_safe_read(session, *payload, *payload_len, opcode)) {
return -1;
}
}
/* If a mask is present unmask the payload */
if (mask_present) {
unsigned int pos;