[new new] Prepare for upcoming changes of 'new' in esp8266/Arduino

See esp8266/Arduino#7536
TD-er · Aug 30, 2020 · 6f1dcae · 6f1dcae
1 parent 6622ac8
commit 6f1dcae
Show file tree

Hide file tree

Showing 45 changed files with 115 additions and 80 deletions.
diff --git a/lib/SerialDevices/jkSDS011.cpp b/lib/SerialDevices/jkSDS011.cpp
@@ -38,8 +38,9 @@ CjkSDS011::CjkSDS011(int16_t pinRX, int16_t pinTX)
   _command.SetPacketLength(19);
   _working_period = -1;
   _sleepmode_active = false;
-  _serial = new ESPeasySerial(pinRX, pinTX);
-  _serial->begin(9600);
+  _serial = new (std::nothrow) ESPeasySerial(pinRX, pinTX);
+  if (_serial != nullptr)
+    _serial->begin(9600);
 }
 
 CjkSDS011::~CjkSDS011() {

diff --git a/lib/SerialDevices/jkSDS011.h b/lib/SerialDevices/jkSDS011.h
@@ -64,7 +64,7 @@ class CjkSDS011
   void ParseCommandReply();
 
 //  SensorSerial _serial;
-  ESPeasySerial *_serial;
+  ESPeasySerial *_serial = nullptr;
   CSensorSerialBuffer _data;
   CSensorSerialBuffer _command;
   float _pm2_5;

diff --git a/src/ESPeasyControllerCache.ino b/src/ESPeasyControllerCache.ino
@@ -33,7 +33,7 @@ struct ControllerCache_struct {
 
   void init() {
     if (_RTC_cache_handler == nullptr) {
-      _RTC_cache_handler = new RTC_cache_handler_struct;
+      _RTC_cache_handler = new (std::nothrow) RTC_cache_handler_struct;
     }
   }
 

diff --git a/src/Networking.ino b/src/Networking.ino
@@ -568,6 +568,7 @@ bool SSDP_begin() {
 
   if (_server) {
     _server->unref();
+
     _server = 0;
   }
 
@@ -650,7 +651,8 @@ void SSDP_send(byte method) {
               (uint16_t)((chipId >>  8) & 0xff),
               (uint16_t)chipId        & 0xff);
 
-    char *buffer = new char[1460]();
+    char *buffer = new (std::nothrow) char[1460]();
+    if (buffer == nullptr) { return; }
     int   len    = snprintf(buffer, 1460,
                             _ssdp_packet_template.c_str(),
                             (method == 0) ? _ssdp_response_template.c_str() : _ssdp_notify_template.c_str(),

diff --git a/src/_C018.ino b/src/_C018.ino
@@ -74,7 +74,7 @@ struct C018_data_struct {
     _baudrate = baudrate;
 
     // FIXME TD-er: Make force SW serial a proper setting.
-    C018_easySerial = new ESPeasySerial(serial_rx, serial_tx, false, 64, C018_FORCE_SW_SERIAL);
+    C018_easySerial = new (std::nothrow) ESPeasySerial(serial_rx, serial_tx, false, 64, C018_FORCE_SW_SERIAL);
 
     if (C018_easySerial != nullptr) {
       myLora = new rn2xx3(*C018_easySerial);

diff --git a/src/_P002_ADC.ino b/src/_P002_ADC.ino
@@ -191,7 +191,7 @@ boolean Plugin_002(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
     {
-      initPluginTaskData(event->TaskIndex, new P002_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P002_data_struct());
       P002_data_struct *P002_data =
         static_cast<P002_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P014_SI7021.ino b/src/_P014_SI7021.ino
@@ -445,7 +445,7 @@ boolean Plugin_014(byte function, struct EventStruct *event, String& string)
     {
       // Get sensor resolution configuration
       uint8_t res = PCONFIG(0);
-      initPluginTaskData(event->TaskIndex, new P014_data_struct(res));
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P014_data_struct(res));
       P014_data_struct *P014_data =
         static_cast<P014_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P031_SHT1X.ino b/src/_P031_SHT1X.ino
@@ -314,7 +314,7 @@ boolean Plugin_031(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
       {
-        initPluginTaskData(event->TaskIndex, new P031_data_struct());
+        initPluginTaskData(event->TaskIndex, new (std::nothrow) P031_data_struct());
         P031_data_struct *P031_data =
             static_cast<P031_data_struct *>(getPluginTaskData(event->TaskIndex));
         if (nullptr == P031_data) {

diff --git a/src/_P035_IRTX.ino b/src/_P035_IRTX.ino
@@ -116,13 +116,13 @@ boolean Plugin_035(byte function, struct EventStruct *event, String &command)
         }
 
 #ifdef P016_P035_Extended_AC
-        if (Plugin_035_commonAc == 0 && irPin != -1)
+        if (Plugin_035_commonAc == nullptr && irPin != -1)
         {
           addLog(LOG_LEVEL_INFO, F("INIT AC: IR TX"));
           addLog(LOG_LEVEL_INFO, String(F("Supported Protocols by IRSENDAC: ")) + listACProtocols());
-          Plugin_035_commonAc = new IRac(irPin);
+          Plugin_035_commonAc = new (std::nothrow) IRac(irPin);
         }
-        if (Plugin_035_commonAc != 0 && irPin == -1)
+        if (Plugin_035_commonAc != nullptr && irPin == -1)
         {
           addLog(LOG_LEVEL_INFO, F("INIT AC: IR TX Removed"));
           delete Plugin_035_commonAc;
@@ -298,7 +298,7 @@ boolean handleRawRaw2Encoding(const String &cmd) {
 
   uint16_t idx = 0; //If this goes above the buf.size then the esp will throw a 28 EXCCAUSE
   uint16_t *buf;
-  buf = new uint16_t[P35_Ntimings]; //The Raw Timings that we can buffer.
+  buf = new (std::nothrow) uint16_t[P35_Ntimings]; //The Raw Timings that we can buffer.
   if (buf == nullptr)
   { // error assigning memory.
     return false;

diff --git a/src/_P036_FrameOLED.ino b/src/_P036_FrameOLED.ino
@@ -243,7 +243,7 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string)
         // For load and save of the display lines, we must not rely on the data in memory.
         // This data in memory can be altered through write commands.
         // Therefore we must read the lines from flash in a temporary object.
-        P036_data_struct *P036_data = new P036_data_struct();
+        P036_data_struct *P036_data = new (std::nothrow) P036_data_struct();
 
         if (nullptr != P036_data) {
           uint8_t version = get4BitFromUL(PCONFIG_LONG(0), 20); // Bit23-20 Version CustomTaskSettings
@@ -302,7 +302,7 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string)
         // For load and save of the display lines, we must not rely on the data in memory.
         // This data in memory can be altered through write commands.
         // Therefore we must use a temporary version to store the settings.
-        P036_data_struct *P036_data = new P036_data_struct();
+        P036_data_struct *P036_data = new (std::nothrow) P036_data_struct();
 
         if (nullptr != P036_data) {
           String error;
@@ -349,7 +349,7 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
     {
-      initPluginTaskData(event->TaskIndex, new P036_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P036_data_struct());
       P036_data_struct *P036_data =
         static_cast<P036_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P044_P1WifiGateway.ino b/src/_P044_P1WifiGateway.ino
@@ -94,7 +94,7 @@ boolean Plugin_044(byte function, struct EventStruct *event, String& string)
           // It was already created and initialzed
           // So don't recreate to keep the webserver running.
         } else {
-          initPluginTaskData(event->TaskIndex, new P044_Task());
+          initPluginTaskData(event->TaskIndex, new (std::nothrow) P044_Task());
           task = static_cast<P044_Task *>(getPluginTaskData(event->TaskIndex));
         }
         if (nullptr == task) {

diff --git a/src/_P049_MHZ19.ino b/src/_P049_MHZ19.ino
@@ -140,7 +140,10 @@ struct P049_data_struct : public PluginTaskData_base {
     if (serial_rx < 0 || serial_tx < 0)
       return false;
     reset();
-    easySerial = new ESPeasySerial(serial_rx, serial_tx);
+    easySerial = new (std::nothrow) ESPeasySerial(serial_rx, serial_tx);
+    if (easySerial == nullptr) {
+      return false;
+    }
     easySerial->begin(9600);
     ABC_Disable = setABCdisabled;
     if (ABC_Disable) {
@@ -443,7 +446,7 @@ boolean Plugin_049(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
       {
-        initPluginTaskData(event->TaskIndex, new P049_data_struct());
+        initPluginTaskData(event->TaskIndex, new (std::nothrow) P049_data_struct());
         success = P049_performInit(event);
         break;
       }

diff --git a/src/_P052_SenseAir.ino b/src/_P052_SenseAir.ino
@@ -443,7 +443,7 @@ boolean Plugin_052(byte function, struct EventStruct *event, String& string) {
     case PLUGIN_INIT: {
       const int16_t serial_rx = CONFIG_PIN1;
       const int16_t serial_tx = CONFIG_PIN2;
-      initPluginTaskData(event->TaskIndex, new P052_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P052_data_struct());
       P052_data_struct *P052_data =
         static_cast<P052_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P053_PMSx003.ino b/src/_P053_PMSx003.ino
@@ -247,7 +247,10 @@ boolean Plugin_053(byte function, struct EventStruct *event, String& string)
           log = F("PMSx003: using software serial");
           addLog(LOG_LEVEL_INFO, log);
         }
-        P053_easySerial = new ESPeasySerial(rxPin, txPin, false, 96); // 96 Bytes buffer, enough for up to 3 packets.
+        P053_easySerial = new (std::nothrow) ESPeasySerial(rxPin, txPin, false, 96); // 96 Bytes buffer, enough for up to 3 packets.
+        if (P053_easySerial == nullptr) {
+          break;
+        }
         P053_easySerial->begin(9600);
         P053_easySerial->flush();
 

diff --git a/src/_P064_APDS9960.ino b/src/_P064_APDS9960.ino
@@ -228,7 +228,10 @@ boolean Plugin_064(byte function, struct EventStruct *event, String& string)
       if (PLUGIN_064_pds) {
         delete PLUGIN_064_pds;
       }
-      PLUGIN_064_pds = new SparkFun_APDS9960();
+      PLUGIN_064_pds = new (std::nothrow) SparkFun_APDS9960();
+      if (PLUGIN_064_pds == nullptr) {
+        break;
+      }
 
       String log = F("APDS : ");
 

diff --git a/src/_P065_DRF0299_MP3.ino b/src/_P065_DRF0299_MP3.ino
@@ -101,13 +101,13 @@ boolean Plugin_065(byte function, struct EventStruct *event, String& string)
         #pragma GCC diagnostic pop
 
 
-        P065_easySerial = new ESPeasySerial(-1, CONFIG_PIN1);   // no RX, only TX
+        P065_easySerial = new (std::nothrow) ESPeasySerial(-1, CONFIG_PIN1);   // no RX, only TX
+        if (P065_easySerial != nullptr) {
+          P065_easySerial->begin(9600);
+          Plugin_065_SetVol(PCONFIG(0));   // set default volume
 
-        P065_easySerial->begin(9600);
-
-        Plugin_065_SetVol(PCONFIG(0));   // set default volume
-
-        success = true;
+          success = true;
+        }
         break;
       }
 

diff --git a/src/_P068_SHT3x.ino b/src/_P068_SHT3x.ino
@@ -192,7 +192,7 @@ boolean Plugin_068(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
     {
-      initPluginTaskData(event->TaskIndex, new SHT3X(PCONFIG(0)));
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) SHT3X(PCONFIG(0)));
       success = true;
       break;
     }

diff --git a/src/_P069_LM75A.ino b/src/_P069_LM75A.ino
@@ -180,7 +180,7 @@ boolean Plugin_069(byte function, struct EventStruct *event, String& string)
       if (PLUGIN_069_LM75A) {
         delete PLUGIN_069_LM75A;
       }
-      PLUGIN_069_LM75A = new LM75A((uint8_t)PCONFIG(0));
+      PLUGIN_069_LM75A = new (std::nothrow) LM75A((uint8_t)PCONFIG(0));
 
       success = true;
       break;

diff --git a/src/_P070_NeoPixel_Clock.ino b/src/_P070_NeoPixel_Clock.ino
@@ -34,7 +34,10 @@ struct P070_data_struct : public PluginTaskData_base {
   void init(struct EventStruct *event) {
     if (!Plugin_070_pixels)
     {
-      Plugin_070_pixels = new Adafruit_NeoPixel(NUMBER_LEDS, CONFIG_PIN1, NEO_GRB + NEO_KHZ800);
+      Plugin_070_pixels = new (std::nothrow) Adafruit_NeoPixel(NUMBER_LEDS, CONFIG_PIN1, NEO_GRB + NEO_KHZ800);
+      if (Plugin_070_pixels == nullptr) {
+        return;
+      }
       Plugin_070_pixels->begin(); // This initializes the NeoPixel library.
     }
     set(event);
@@ -236,7 +239,7 @@ boolean Plugin_070(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
       {
-        initPluginTaskData(event->TaskIndex, new P070_data_struct());
+        initPluginTaskData(event->TaskIndex, new (std::nothrow) P070_data_struct());
         P070_data_struct* P070_data = static_cast<P070_data_struct*>(getPluginTaskData(event->TaskIndex));
         if (nullptr == P070_data) {
           return success;

diff --git a/src/_P073_7DGT.ino b/src/_P073_7DGT.ino
@@ -327,7 +327,7 @@ boolean Plugin_073(byte function, struct EventStruct *event, String& string) {
     }
 
     case PLUGIN_INIT: {
-      initPluginTaskData(event->TaskIndex, new P073_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P073_data_struct());
       P073_data_struct *P073_data =
         static_cast<P073_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P074_TSL2591.ino b/src/_P074_TSL2591.ino
@@ -150,7 +150,7 @@ boolean Plugin_074(byte function, struct EventStruct *event, String& string) {
     }
 
     case PLUGIN_INIT: {
-      initPluginTaskData(event->TaskIndex, new P074_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P074_data_struct());
       P074_data_struct *P074_data =
         static_cast<P074_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P075_Nextion.ino b/src/_P075_Nextion.ino
@@ -58,7 +58,7 @@ struct P075_data_struct : public PluginTaskData_base {
     if (baudrate < 9600 || baudrate > 115200) {
       baudrate = 9600;
     }
-    easySerial = new ESPeasySerial(rx, tx, false, RXBUFFSZ);
+    easySerial = new (std::nothrow) ESPeasySerial(rx, tx, false, RXBUFFSZ);
     if (easySerial != nullptr) {
       easySerial->begin(baudrate);
       easySerial->flush();
@@ -239,7 +239,7 @@ boolean Plugin_075(byte function, struct EventStruct *event, String& string)
 
       if(BaudCode > P075_B115200) BaudCode = P075_B9600;
       const uint32_t BaudArray[4] = {9600UL, 38400UL, 57600UL, 115200UL};
-      initPluginTaskData(event->TaskIndex, new P075_data_struct(CONFIG_PIN1, CONFIG_PIN2, BaudArray[BaudCode]));
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P075_data_struct(CONFIG_PIN1, CONFIG_PIN2, BaudArray[BaudCode]));
       P075_data_struct* P075_data = static_cast<P075_data_struct*>(getPluginTaskData(event->TaskIndex));
       if (nullptr != P075_data) {
         P075_data->loadDisplayLines(event->TaskIndex);

diff --git a/src/_P076_HLW8012.ino b/src/_P076_HLW8012.ino
@@ -378,7 +378,7 @@ boolean Plugin_076(byte function, struct EventStruct *event, String &string) {
     const byte SEL_PIN = CONFIG_PIN1;
 
     if (CF_PIN != -1 && CF1_PIN != -1 && SEL_PIN != -1) {
-      Plugin_076_hlw = new HLW8012;
+      Plugin_076_hlw = new (std::nothrow) HLW8012;
       if (Plugin_076_hlw) {
         byte currentRead = PCONFIG(4);
         byte cf_trigger  = PCONFIG(5);

diff --git a/src/_P077_CSE7766.ino b/src/_P077_CSE7766.ino
@@ -242,7 +242,7 @@ boolean Plugin_077(byte function, struct EventStruct *event, String &string) {
   }
 
   case PLUGIN_INIT: {
-    initPluginTaskData(event->TaskIndex, new P077_data_struct());
+    initPluginTaskData(event->TaskIndex, new (std::nothrow) P077_data_struct());
     if (PCONFIG(0) == 0) PCONFIG(0) = HLW_UREF_PULSE;
     if (PCONFIG(1) == 0) PCONFIG(1) = HLW_IREF_PULSE;
     if (PCONFIG(2) == 0) PCONFIG(2) = HLW_PREF_PULSE;

diff --git a/src/_P078_Eastron.ino b/src/_P078_Eastron.ino
@@ -209,7 +209,10 @@ boolean Plugin_078(byte function, struct EventStruct *event, String& string)
           delete Plugin_078_SoftSerial;
           Plugin_078_SoftSerial=NULL;
         }
-        Plugin_078_SoftSerial = new ESPeasySerial(CONFIG_PIN1, CONFIG_PIN2);
+        Plugin_078_SoftSerial = new (std::nothrow) ESPeasySerial(CONFIG_PIN1, CONFIG_PIN2);
+        if (Plugin_078_SoftSerial == nullptr) {
+          break;
+        }
         unsigned int baudrate = p078_storageValueToBaudrate(P078_BAUDRATE);
         Plugin_078_SoftSerial->begin(baudrate);
 
@@ -218,8 +221,10 @@ boolean Plugin_078(byte function, struct EventStruct *event, String& string)
           Plugin_078_SDM=NULL;
         }
         Plugin_078_SDM = new SDM(*Plugin_078_SoftSerial, baudrate, P078_DEPIN);
-        Plugin_078_SDM->begin();
-        success = true;
+        if (Plugin_078_SDM != nullptr) {
+          Plugin_078_SDM->begin();
+          success = true;
+        }
         break;
       }
 

diff --git a/src/_P081_Cron.ino b/src/_P081_Cron.ino
@@ -266,7 +266,7 @@ boolean Plugin_081(byte function, struct EventStruct *event, String& string)
 
     case PLUGIN_INIT:
     {
-      initPluginTaskData(event->TaskIndex, new P081_data_struct(P081_getCronExpr(event->TaskIndex)));
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P081_data_struct(P081_getCronExpr(event->TaskIndex)));
       P081_data_struct *P081_data =
         static_cast<P081_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P082_GPS.ino b/src/_P082_GPS.ino
@@ -89,9 +89,11 @@ struct P082_data_struct : public PluginTaskData_base {
       return false;
     }
     reset();
-    gps             = new TinyGPSPlus();
-    P082_easySerial = new ESPeasySerial(serial_rx, serial_tx);
-    P082_easySerial->begin(9600);
+    gps             = new (std::nothrow) TinyGPSPlus();
+    P082_easySerial = new (std::nothrow) ESPeasySerial(serial_rx, serial_tx);
+    if (P082_easySerial != nullptr) {
+      P082_easySerial->begin(9600);
+    }
     return isInitialized();
   }
 
@@ -393,7 +395,7 @@ boolean Plugin_082(byte function, struct EventStruct *event, String& string) {
       const int16_t serial_rx = CONFIG_PIN1;
       const int16_t serial_tx = CONFIG_PIN2;
       const int16_t pps_pin   = CONFIG_PIN3;
-      initPluginTaskData(event->TaskIndex, new P082_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P082_data_struct());
       P082_data_struct *P082_data =
         static_cast<P082_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P085_AcuDC243.ino b/src/_P085_AcuDC243.ino
@@ -324,7 +324,7 @@ boolean Plugin_085(byte function, struct EventStruct *event, String& string) {
     case PLUGIN_INIT: {
       const int16_t serial_rx = CONFIG_PIN1;
       const int16_t serial_tx = CONFIG_PIN2;
-      initPluginTaskData(event->TaskIndex, new P085_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P085_data_struct());
       P085_data_struct *P085_data =
         static_cast<P085_data_struct *>(getPluginTaskData(event->TaskIndex));
 

diff --git a/src/_P087_SerialProxy.ino b/src/_P087_SerialProxy.ino
@@ -165,7 +165,7 @@ boolean Plugin_087(byte function, struct EventStruct *event, String& string) {
     case PLUGIN_INIT: {
       const int16_t serial_rx = CONFIG_PIN1;
       const int16_t serial_tx = CONFIG_PIN2;
-      initPluginTaskData(event->TaskIndex, new P087_data_struct());
+      initPluginTaskData(event->TaskIndex, new (std::nothrow) P087_data_struct());
       P087_data_struct *P087_data =
         static_cast<P087_data_struct *>(getPluginTaskData(event->TaskIndex));