Merge pull request #514 from simap/master

read can return -1, check for this to avoid corrupting protocol
This commit is contained in:
Markus
2020-02-15 22:18:48 +01:00
committed by GitHub

View File

@ -595,7 +595,7 @@ bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWait
#else #else
unsigned long t = millis(); unsigned long t = millis();
size_t len; ssize_t len;
DEBUG_WEBSOCKETS("[readCb] n: %zu t: %lu\n", n, t); DEBUG_WEBSOCKETS("[readCb] n: %zu t: %lu\n", n, t);
while(n > 0) { while(n > 0) {
if(client->tcp == NULL) { if(client->tcp == NULL) {
@ -633,7 +633,7 @@ bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWait
} }
len = client->tcp->read((uint8_t *)out, n); len = client->tcp->read((uint8_t *)out, n);
if(len) { if(len > 0) {
t = millis(); t = millis();
out += len; out += len;
n -= len; n -= len;