Prevent Buffer Overflow and Added FlashStringHelper for text and binary (#26)

* Prevent buffer overflow on received data

* pass to 7 char to avoid save to flash by SDK

* return _contentLength, avoid array reparse to know len

* Added FlashStringHelper for text and binary

* Added FlashStringHelper also to AsyncWebSocketClient

* Added PROGMEM doc

* Corrected binary was sending PSTR as text, addded len

* Server calls client method and code as asked @me-no-dev

* server calls client method and code as asked by @me-no-dev

* Changed Code presentation
This commit is contained in:
Charles
2016-05-12 14:17:35 +02:00
committed by Me No Dev
parent 95a14dbdf2
commit 1d275900eb
6 changed files with 134 additions and 47 deletions

View File

@@ -504,6 +504,21 @@ void AsyncWebSocketClient::text(char * message){
void AsyncWebSocketClient::text(String &message){
text(message.c_str(), message.length());
}
void AsyncWebSocketClient::text(const __FlashStringHelper *data){
PGM_P p = reinterpret_cast<PGM_P>(data);
size_t n = 0;
while (1) {
if (pgm_read_byte(p+n) == 0) break;
n += 1;
}
char * message = (char*) malloc(n+1);
if(message){
for(size_t b=0; b<n; b++)
message[b] = pgm_read_byte(p++);
message[n] = 0;
text(message, n);
}
}
void AsyncWebSocketClient::binary(const char * message, size_t len){
_queueMessage(new AsyncWebSocketBasicMessage(message, len, WS_BINARY));
@@ -520,6 +535,15 @@ void AsyncWebSocketClient::binary(char * message){
void AsyncWebSocketClient::binary(String &message){
binary(message.c_str(), message.length());
}
void AsyncWebSocketClient::binary(const __FlashStringHelper *data, size_t len){
PGM_P p = reinterpret_cast<PGM_P>(data);
char * message = (char*) malloc(len);
if(message){
for(size_t b=0; b<len; b++)
message[b] = pgm_read_byte(p++);
binary(message, len);
}
}
IPAddress AsyncWebSocketClient::remoteIP() {
if(!_client) {
@@ -728,6 +752,11 @@ void AsyncWebSocket::text(uint32_t id, char * message){
void AsyncWebSocket::text(uint32_t id, String &message){
text(id, message.c_str(), message.length());
}
void AsyncWebSocket::text(uint32_t id, const __FlashStringHelper *message){
AsyncWebSocketClient * c = client(id);
if(c != NULL)
c->text(message);
}
void AsyncWebSocket::textAll(const char * message){
textAll(message, strlen(message));
}
@@ -740,6 +769,14 @@ void AsyncWebSocket::textAll(char * message){
void AsyncWebSocket::textAll(String &message){
textAll(message.c_str(), message.length());
}
void AsyncWebSocket::textAll(const __FlashStringHelper *message){
AsyncWebSocketClient * c = _clients;
while(c != NULL){
if(c->status() == WS_CONNECTED)
c->text(message);
c = c->next;
}
}
void AsyncWebSocket::binary(uint32_t id, const char * message){
binary(id, message, strlen(message));
}
@@ -752,6 +789,11 @@ void AsyncWebSocket::binary(uint32_t id, char * message){
void AsyncWebSocket::binary(uint32_t id, String &message){
binary(id, message.c_str(), message.length());
}
void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper *message, size_t len){
AsyncWebSocketClient * c = client(id);
if(c != NULL)
c-> binary(message, len);
}
void AsyncWebSocket::binaryAll(const char * message){
binaryAll(message, strlen(message));
}
@@ -764,6 +806,14 @@ void AsyncWebSocket::binaryAll(char * message){
void AsyncWebSocket::binaryAll(String &message){
binaryAll(message.c_str(), message.length());
}
void AsyncWebSocket::binaryAll(const __FlashStringHelper *message, size_t len){
AsyncWebSocketClient * c = _clients;
while(c != NULL){
if(c->status() == WS_CONNECTED)
c-> binary(message, len);
c = c->next;
}
}
const char * WS_STR_CONNECTION = "Connection";
const char * WS_STR_UPGRADE = "Upgrade";