Merge branch 'master' into s2

Author: Aircoookie

library.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/me-no-dev/ESPAsyncWebServer.git"
   },
-  "version": "2.0.2",
+  "version": "2.0.3",
   "license": "LGPL-3.0",
   "frameworks": "arduino",
   "platforms": ["espressif8266", "espressif32"],

library.properties

@@ -1,5 +1,5 @@
 name=ESP Async WebServer
-version=2.0.2
+version=2.0.3
 author=Me-No-Dev
 maintainer=Me-No-Dev
 sentence=Async Web Server for ESP8266 and ESP31B (Aircoookie fork)

src/AsyncWebSocket.cpp

@@ -1241,17 +1241,9 @@ AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket
   _code = 101;
   _sendContentLength = false;
 
-  uint8_t * hash = (uint8_t*)malloc(20);
-  if(hash == NULL){
-    _state = RESPONSE_FAILED;
-    return;
-  }
-  char * buffer = (char *) malloc(33);
-  if(buffer == NULL){
-    free(hash);
-    _state = RESPONSE_FAILED;
-    return;
-  }
+  uint8_t * hash[20];
+  char * buffer[33];
+
 #ifdef ESP8266
   sha1(key + WS_STR_UUID, hash);
 #else
@@ -1270,8 +1262,6 @@ AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket
   addHeader(WS_STR_CONNECTION, WS_STR_UPGRADE);
   addHeader(WS_STR_UPGRADE, "websocket");
   addHeader(WS_STR_ACCEPT,buffer);
-  free(buffer);
-  free(hash);
 }
 
 void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request){

src/ESPAsyncWebServer.h

@@ -391,6 +391,7 @@ class AsyncWebServer {
     AsyncCallbackWebHandler* _catchAllHandler;
 
   public:
+    AsyncWebServer(IPAddress addr, uint16_t port);
     AsyncWebServer(uint16_t port);
     ~AsyncWebServer();
 

src/WebAuthentication.cpp

@@ -65,10 +65,7 @@ static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or mo
     md5_context_t _ctx;
 #endif
   uint8_t i;
-  uint8_t * _buf = (uint8_t*)malloc(16);
-  if(_buf == NULL)
-    return false;
-  memset(_buf, 0x00, 16);
+  uint8_t * _buf[16] = {0};
 #ifdef ESP32
   mbedtls_md5_init(&_ctx);
   mbedtls_md5_starts_ret(&_ctx);
@@ -82,7 +79,6 @@ static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or mo
   for(i = 0; i < 16; i++) {
     sprintf(output + (i * 2), "%02x", _buf[i]);
   }
-  free(_buf);
   return true;
 }
 
@@ -92,38 +88,35 @@ static String genRandomMD5(){
 #else
   uint32_t r = rand();
 #endif
-  char * out = (char*)malloc(33);
+  char * out[33];
   if(out == NULL || !getMD5((uint8_t*)(&r), 4, out))
     return "";
   String res = String(out);
-  free(out);
   return res;
 }
 
 static String stringMD5(const String& in){
-  char * out = (char*)malloc(33);
-  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
+  char * out[33];
+  if(!getMD5((uint8_t*)(in.c_str()), in.length(), out))
     return "";
   String res = String(out);
-  free(out);
   return res;
 }
 
 String generateDigestHash(const char * username, const char * password, const char * realm){
   if(username == NULL || password == NULL || realm == NULL){
     return "";
   }
-  char * out = (char*)malloc(33);
+  char * out[33];
   String res = String(username);
   res.concat(":");
   res.concat(realm);
   res.concat(":");
   String in = res;
   in.concat(password);
-  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
+  if(!getMD5((uint8_t*)(in.c_str()), in.length(), out))
     return "";
   res.concat(out);
-  free(out);
   return res;
 }
 

src/WebServer.cpp

@@ -29,9 +29,13 @@ bool ON_AP_FILTER(AsyncWebServerRequest *request) {
   return WiFi.localIP() != request->client()->localIP();
 }
 
-
 AsyncWebServer::AsyncWebServer(uint16_t port)
-  : _server(port)
+  : AsyncWebServer(IPADDR_ANY, port)
+{
+}
+
+AsyncWebServer::AsyncWebServer(IPAddress addr, uint16_t port)
+  : _server(addr, port)
   , _rewrites(LinkedList<AsyncWebRewrite*>([](AsyncWebRewrite* r){ delete r; }))
   , _handlers(LinkedList<AsyncWebHandler*>([](AsyncWebHandler* h){ delete h; }))
 {