kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-18 17:35:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_http_websocket: Fix faulty read logic."

Browse Source
This commit is contained in:
zuul
2017-03-08 10:05:19 -06:00
committed by Gerrit Code Review
parent 9cd1a754a9 5d0371d743
commit ff0569740a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/res_http_websocket.c
+6 -4
View File
@@ -529,10 +529,12 @@ static inline int ws_safe_read(struct ast_websocket *session, char *buf, int len
return -1;
}
}
xlen = xlen - rlen;
rbuf = rbuf + rlen;
if (!xlen) {
break;
if (rlen > 0) {
xlen = xlen - rlen;
rbuf = rbuf + rlen;
if (!xlen) {
break;
}
}
if (ast_wait_for_input(ast_iostream_get_fd(session->stream), 1000) < 0) {
ast_log(LOG_ERROR, "ast_wait_for_input returned err: %s\n", strerror(errno));