WIP

Author: mrengineer7777

libraries/BLE/src/BLEAdvertising.cpp

@@ -193,7 +193,12 @@ void BLEAdvertising::start() {
 	int numServices = m_serviceUUIDs.size();
 	if (numServices > 0) {
 		m_advData.service_uuid_len = 16 * numServices;
-		m_advData.p_service_uuid = new uint8_t[m_advData.service_uuid_len];
+		m_advData.p_service_uuid = (uint8_t *)malloc(m_advData.service_uuid_len);
+		if(!m_advData.p_service_uuid) {
+			log_e(">> start failed: out of memory");
+			return;
+		}
+
 		uint8_t* p = m_advData.p_service_uuid;
 		for (int i = 0; i < numServices; i++) {
 			log_d("- advertising service: %s", m_serviceUUIDs[i].toString().c_str());
@@ -238,10 +243,8 @@ void BLEAdvertising::start() {
 
 	// If we had services to advertise then we previously allocated some storage for them.
 	// Here we release that storage.
-	if (m_advData.service_uuid_len > 0) {
-		delete[] m_advData.p_service_uuid;
-		m_advData.p_service_uuid = nullptr;
-	}
+	free(m_advData.p_service_uuid); //TODO change this variable to local scope?
+	m_advData.p_service_uuid = nullptr;
 
 	// Start advertising.
 	errRc = ::esp_ble_gap_start_advertising(&m_advParams);

libraries/WebServer/src/WebServer.cpp

@@ -24,7 +24,6 @@
 #include <Arduino.h>
 #include <esp32-hal-log.h>
 #include <libb64/cencode.h>
-#include <new>
 #include "WiFiServer.h"
 #include "WiFiClient.h"
 #include "WebServer.h"
@@ -146,26 +145,26 @@ bool WebServer::authenticate(const char * username, const char * password){
       authReq = authReq.substring(6);
       authReq.trim();
       char toencodeLen = strlen(username)+strlen(password)+1;
-      char *toencode = new(std::nothrow) char[toencodeLen + 1];
+      char *toencode = (char *)malloc[toencodeLen + 1];
       if(toencode == NULL){
         authReq = "";
         return false;
       }
-      char *encoded = new(std::nothrow) char[base64_encode_expected_len(toencodeLen)+1];
+      char *encoded = (char *)malloc(base64_encode_expected_len(toencodeLen)+1);
       if(encoded == NULL){
         authReq = "";
-        delete[] toencode;
+        free(toencode);
         return false;
       }
       sprintf(toencode, "%s:%s", username, password);
       if(base64_encode_chars(toencode, toencodeLen, encoded) > 0 && authReq.equalsConstantTime(encoded)) {
         authReq = "";
-        delete[] toencode;
-        delete[] encoded;
+        free(toencode);
+        free(encoded);
         return true;
       }
-      delete[] toencode;
-      delete[] encoded;
+      free(toencode);
+      free(encoded);;
     } else if(authReq.startsWith(F("Digest"))) {
       authReq = authReq.substring(7);
       log_v("%s", authReq.c_str());

libraries/WiFi/src/WiFiUdp.cpp

@@ -44,11 +44,12 @@ uint8_t WiFiUDP::begin(IPAddress address, uint16_t port){
 
   server_port = port;
 
-  tx_buffer = new(std::nothrow) char[1460];
+  tx_buffer = (char *)malloc(1460);
   if(!tx_buffer){
     log_e("could not create tx buffer: %d", errno);
     return 0;
   }
+  tx_buffer_len = 0;
 
   if ((udp_server=socket(AF_INET, SOCK_DGRAM, 0)) == -1){
     log_e("could not create socket: %d", errno);
@@ -100,7 +101,7 @@ uint8_t WiFiUDP::beginMulticast(IPAddress a, uint16_t p){
 
 void WiFiUDP::stop(){
   if(tx_buffer){
-    delete[] tx_buffer;
+    free(tx_buffer);
     tx_buffer = NULL;
   }
   tx_buffer_len = 0;
@@ -136,13 +137,12 @@ int WiFiUDP::beginPacket(){
 
   // allocate tx_buffer if is necessary
   if(!tx_buffer){
-    tx_buffer = new(std::nothrow) char[1460];
+    tx_buffer = (char *)malloc(1460);
     if(!tx_buffer){
       log_e("could not create tx buffer: %d", errno);
       return 0;
     }
   }
-
   tx_buffer_len = 0;
 
   // check whereas socket is already open